npm - @bjsdistribution/dms-client-return - Versions diffs - 0.0.33 → 0.0.35 - Mend

@bjsdistribution/dms-client-return 0.0.33 → 0.0.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

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

@@ -687,10 +687,6 @@ var deleteProdId = /*#__PURE__*/jotai.atom([]);
 function useDeleteProdsID() {
   return jotai.useAtom(deleteProdId);
 }
-var createOrderProduct = /*#__PURE__*/jotai.atom([]);
-function useCreateOrderProducts() {
-  return jotai.useAtom(createOrderProduct);
-}
 var errorAtom = /*#__PURE__*/jotai.atom({
   homeContactError: '',
   workCOntanctError: '',
@@ -3481,6 +3477,21 @@ var ActionIcon = function ActionIcon() {
   }));
 };
+var _templateObject$U, _templateObject2$G, _templateObject3$m, _templateObject4$a, _templateObject5$5, _templateObject6$3, _templateObject7$3;
+function Loader(props) {
+  return React__default.createElement(MainContainer$6, {
+    id: "loder"
+  }, React__default.createElement(Container$B, null, React__default.createElement(Spinner, null), React__default.createElement(Wrapper$b, null, React__default.createElement(Title, null, props.title || 'Loading...'), React__default.createElement(Subtitle, null, props.subtitle || "Sit tight - won't be long!"))));
+}
+var rotate = /*#__PURE__*/styled.keyframes(_templateObject$U || (_templateObject$U = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  from {\n    transform: rotate(0deg);\n  }\n  to {\n    transform: rotate(360deg);\n  }\n"])));
+// Styled components for the loading spinner
+var Spinner = /*#__PURE__*/styled__default.div(_templateObject2$G || (_templateObject2$G = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  border: 4px solid rgb(0 0 0 / 50%);\n  border-left-color: #feba30;\n  border-radius: 50%;\n  width: 50px;\n  height: 50px;\n  animation: ", " 1s linear infinite;\n"])), rotate);
+var Container$B = /*#__PURE__*/styled__default.div(_templateObject3$m || (_templateObject3$m = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  gap: 25px;\n  align-items: center;\n  flex-direction: column;\n  text-align: center;\n"])));
+var Subtitle = /*#__PURE__*/styled__default.span(_templateObject4$a || (_templateObject4$a = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: white;\n  font-size: 25px;\n  text-transform: capitalize;\n  font-weight: bold;\n"])));
+var Title = /*#__PURE__*/styled__default.span(_templateObject5$5 || (_templateObject5$5 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: white;\n  font-size: 25px;\n  text-transform: capitalize;\n  font-weight: bold;\n"])));
+var Wrapper$b = /*#__PURE__*/styled__default.div(_templateObject6$3 || (_templateObject6$3 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  gap: 20px;\n"])));
+var MainContainer$6 = /*#__PURE__*/styled__default.div(_templateObject7$3 || (_templateObject7$3 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  position: fixed;\n  top: 0;\n  left: 0;\n  width: 100%;\n  height: 100%;\n  z-index: 9999;\n  background-color: rgba(0, 0, 0, 0.3);\n  backdrop-filter: blur(5px);\n  display: flex;\n  justify-content: center;\n  align-items: center;\n"])));
 var CreateReturnInitial = {
   customer_id: 0,
   account_number: '',
@@ -3488,6 +3499,10 @@ var CreateReturnInitial = {
   products: [],
   return_action: []
 };
+var AssignUpdateInitial = {
+  return_order_id: 0,
+  bjs_delivery: false
+};
 var customerData = /*#__PURE__*/jotai.atom([]);
 var actionTypeData = /*#__PURE__*/jotai.atom([]);
 var locationData = /*#__PURE__*/jotai.atom([]);
@@ -3500,6 +3515,11 @@ var selectAll = /*#__PURE__*/jotai.atom(false);
 var postLoading = /*#__PURE__*/jotai.atom(false);
 var _final = /*#__PURE__*/jotai.atom([]);
 var clearState = /*#__PURE__*/jotai.atom(false);
+var assignData = /*#__PURE__*/jotai.atom([]);
+var assignPayload = /*#__PURE__*/jotai.atom(AssignUpdateInitial);
+var callAPIAgain = /*#__PURE__*/jotai.atom(true);
+var actionTypeOptions = /*#__PURE__*/jotai.atom([]);
+var selectedProductsMove = /*#__PURE__*/jotai.atom([]);
 var selectedOrderlList = /*#__PURE__*/jotai.atom([]);
 function useSelectedOrders() {
   return jotai.useAtom(selectedOrderlList);
@@ -3545,26 +3565,27 @@ function useFinalPayload() {
 function useClearState() {
   return jotai.useAtom(clearState);
 }
-var _templateObject$U, _templateObject2$G, _templateObject3$m, _templateObject4$a, _templateObject5$5, _templateObject6$3, _templateObject7$3;
-function Loader(props) {
-  return React__default.createElement(MainContainer$6, {
-    id: "loder"
-  }, React__default.createElement(Container$B, null, React__default.createElement(Spinner, null), React__default.createElement(Wrapper$b, null, React__default.createElement(Title, null, props.title || 'Loading...'), React__default.createElement(Subtitle, null, props.subtitle || "Sit tight - won't be long!"))));
+function useAssignData() {
+  return jotai.useAtom(assignData);
+}
+function useAssignPayload() {
+  return jotai.useAtom(assignPayload);
+}
+function useCallApiAgain() {
+  return jotai.useAtom(callAPIAgain);
+}
+function useActionTypeOptions() {
+  return jotai.useAtom(actionTypeOptions);
+}
+function useSelectedProducts() {
+  return jotai.useAtom(selectedProductsMove);
 }
-var rotate = /*#__PURE__*/styled.keyframes(_templateObject$U || (_templateObject$U = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  from {\n    transform: rotate(0deg);\n  }\n  to {\n    transform: rotate(360deg);\n  }\n"])));
-// Styled components for the loading spinner
-var Spinner = /*#__PURE__*/styled__default.div(_templateObject2$G || (_templateObject2$G = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  border: 4px solid rgb(0 0 0 / 50%);\n  border-left-color: #feba30;\n  border-radius: 50%;\n  width: 50px;\n  height: 50px;\n  animation: ", " 1s linear infinite;\n"])), rotate);
-var Container$B = /*#__PURE__*/styled__default.div(_templateObject3$m || (_templateObject3$m = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  gap: 25px;\n  align-items: center;\n  flex-direction: column;\n  text-align: center;\n"])));
-var Subtitle = /*#__PURE__*/styled__default.span(_templateObject4$a || (_templateObject4$a = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: white;\n  font-size: 25px;\n  text-transform: capitalize;\n  font-weight: bold;\n"])));
-var Title = /*#__PURE__*/styled__default.span(_templateObject5$5 || (_templateObject5$5 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: white;\n  font-size: 25px;\n  text-transform: capitalize;\n  font-weight: bold;\n"])));
-var Wrapper$b = /*#__PURE__*/styled__default.div(_templateObject6$3 || (_templateObject6$3 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  gap: 20px;\n"])));
-var MainContainer$6 = /*#__PURE__*/styled__default.div(_templateObject7$3 || (_templateObject7$3 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  position: fixed;\n  top: 0;\n  left: 0;\n  width: 100%;\n  height: 100%;\n  z-index: 9999;\n  background-color: rgba(0, 0, 0, 0.3);\n  backdrop-filter: blur(5px);\n  display: flex;\n  justify-content: center;\n  align-items: center;\n"])));
 var ReturnProductTable = function ReturnProductTable() {
   var _orderStaticData$retu;
-  var _useSelectedOrders = useSelectedOrders(),
-    selectedInvoices = _useSelectedOrders[0];
+  var _useSelectedProducts = useSelectedProducts(),
+    selectedProducts = _useSelectedProducts[0],
+    setSelectedProducts = _useSelectedProducts[1];
   var _useState = React.useState(false),
     selectAll = _useState[0],
     setSelectAll = _useState[1];
@@ -3576,9 +3597,9 @@ var ReturnProductTable = function ReturnProductTable() {
     setSelectedRowId = _useState2[1];
   var _useOrderId = useOrderId(),
     orderId = _useOrderId[0];
-  var handleActionClick = React.useCallback(function (id) {
+  var handleActionClick = function handleActionClick(id) {
     setSelectedRowId(id);
-  }, []);
+  };
   var _useApiHook = dmsComponentLibrary.useApiHook({
       endpoint: "order/order_products/delete/",
       method: 'DELETE',
@@ -3589,21 +3610,19 @@ var ReturnProductTable = function ReturnProductTable() {
       performAction: false
     }),
     isresponse = _useApiHook.data,
-    setaction = _useApiHook.setShouldPerformAction,
+    setAction = _useApiHook.setShouldPerformAction,
     loading = _useApiHook.loading;
   React.useEffect(function () {
     if (isresponse && isresponse.data) {
       antd.notification.success({
         message: 'Success',
-        description:
-        //@ts-ignore
-        (isresponse == null ? void 0 : isresponse.message) || 'An error has occurred. Please try again later.'
+        description: 'An error has occurred. Please try again later.'
       });
       handleRemoveRow();
       setSelectedRowId(null);
     }
   }, [isresponse]);
-  var handleRemoveRow = React.useCallback(function () {
+  var handleRemoveRow = function handleRemoveRow() {
     if (selectedRowId !== null) {
       setProductData(function (prevData) {
         return prevData.filter(function (item) {
@@ -3611,16 +3630,28 @@ var ReturnProductTable = function ReturnProductTable() {
         });
       });
     }
-  }, [selectedRowId, setProductData]);
-  var onDeleteProducts = React.useCallback(function () {
-    setaction(true);
-  }, [setaction, selectedRowId]);
-  var handleSelectAll = React.useCallback(function () {
-    setSelectAll(function (prevSelectAll) {
-      return !prevSelectAll;
+  };
+  var onDeleteProducts = function onDeleteProducts() {
+    setAction(true);
+  };
+  var handleSelectAll = function handleSelectAll() {
+    if (selectAll) {
+      setSelectedProducts([]);
+    } else {
+      var allProductIds = productData.map(function (product) {
+        return product.id;
+      });
+      setSelectedProducts(allProductIds);
+    }
+    setSelectAll(!selectAll);
+  };
+  var handleSelectProduct = function handleSelectProduct(id) {
+    setSelectedProducts(function (prevSelected) {
+      return prevSelected.includes(id) ? prevSelected.filter(function (selectedId) {
+        return selectedId !== id;
+      }) : [].concat(prevSelected, [id]);
     });
-  }, []);
-  // const returnreason =
+  };
   var _useOrderStaticData = useOrderStaticData(),
     orderStaticData = _useOrderStaticData[0];
   var returnReasonsOptions = orderStaticData == null || (_orderStaticData$retu = orderStaticData.return_reasons) == null ? void 0 : _orderStaticData$retu.map(function (option) {
@@ -3633,34 +3664,30 @@ var ReturnProductTable = function ReturnProductTable() {
     var matchedReason = returnReasonsOptions == null ? void 0 : returnReasonsOptions.find(function (option) {
       return option.value === returnReasonId;
     });
-    return matchedReason ? matchedReason.label : 'N/A'; // Return label or 'N/A' if no match found
+    return matchedReason ? matchedReason.label : 'N/A';
   };
   return React__default.createElement("div", null, loading && React__default.createElement(Loader, {
     title: "Deleting"
   }), React__default.createElement(StyledTableWrapper, {
-    id: "tableScrolling"
+    id: "tableScrolling",
+    className: "orderProductTable"
   }, React__default.createElement(StyledTable$1, null, React__default.createElement("thead", null, React__default.createElement("tr", null, React__default.createElement("th", {
-    className: "emailInvoiceCheckbox"
+    className: "emailproductsCheckbox"
   }, React__default.createElement(dmsComponentLibrary.Checkbox, {
     checked: selectAll,
-    onChange: handleSelectAll,
-    disabled: true,
-    style: {
-      cursor: 'not-allowed'
-    }
-  })), React__default.createElement("th", null, "Location"), React__default.createElement("th", null, "Sender"), React__default.createElement("th", null, "Code"), React__default.createElement("th", null, "Description"), React__default.createElement("th", null, "Return Reason"), React__default.createElement("th", null, "Part"), React__default.createElement("th", null, "Action"))), React__default.createElement("tbody", null, productData && productData.length > 0 ? productData.map(function (invoice) {
+    onChange: handleSelectAll
+  })), React__default.createElement("th", null, "Location"), React__default.createElement("th", null, "Sender"), React__default.createElement("th", null, "Code"), React__default.createElement("th", null, "Description"), React__default.createElement("th", null, "Return Reason"), React__default.createElement("th", null, "Part"), React__default.createElement("th", null, "Action"))), React__default.createElement("tbody", null, productData && (productData == null ? void 0 : productData.length) > 0 ? productData == null ? void 0 : productData.map(function (product) {
+    var _product$orders_produ, _product$order_data, _product$order_data2;
     return React__default.createElement("tr", {
-      key: invoice.id
+      key: product.id
     }, React__default.createElement("td", null, React__default.createElement(dmsComponentLibrary.Checkbox, {
-      checked: selectedInvoices.some(function (selectedInvoice) {
-        return selectedInvoice.id === invoice.id;
-      }),
-      style: {
-        cursor: 'not-allowed'
+      checked: selectedProducts == null ? void 0 : selectedProducts.includes(product == null ? void 0 : product.id),
+      onChange: function onChange() {
+        return handleSelectProduct(product == null ? void 0 : product.id);
       }
-    })), React__default.createElement("td", null, 'N/A'), React__default.createElement("td", null, 'N/A'), React__default.createElement("td", null, invoice.code), React__default.createElement("td", null, invoice.description), React__default.createElement("td", null, getReturnReasonLabel(invoice == null ? void 0 : invoice.return_reason_id)), ' ', React__default.createElement("td", null, "1 of 1"), React__default.createElement("td", null, React__default.createElement("div", {
+    })), React__default.createElement("td", null, (product == null || (_product$orders_produ = product.orders_products_stock) == null ? void 0 : _product$orders_produ.location) || 'N/A'), React__default.createElement("td", null, product == null || (_product$order_data = product.order_data) == null || (_product$order_data = _product$order_data.order_recipient) == null ? void 0 : _product$order_data.recipient_name, ' ', product == null || (_product$order_data2 = product.order_data) == null || (_product$order_data2 = _product$order_data2.order_recipient) == null ? void 0 : _product$order_data2.postcode), React__default.createElement("td", null, product == null ? void 0 : product.code), React__default.createElement("td", null, product == null ? void 0 : product.description), React__default.createElement("td", null, getReturnReasonLabel(product == null ? void 0 : product.return_reason_id)), React__default.createElement("td", null, "1 of 1"), React__default.createElement("td", null, React__default.createElement("div", {
       onClick: function onClick() {
-        handleActionClick(invoice.id);
+        handleActionClick(product == null ? void 0 : product.id);
         onDeleteProducts();
       },
       style: {
@@ -3682,47 +3709,189 @@ var ProductTable = function ProductTable() {
 var Container$C = /*#__PURE__*/styled__default.div(_templateObject$V || (_templateObject$V = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  /* height: 230px;  */\n  overflow: auto; /* Enable scrolling */\n  scrollbar-width: thin;\n"])));
 var _templateObject$W, _templateObject2$H;
+var payloadAtom = /*#__PURE__*/jotai.atom(null);
 var NewReturnDropdown = function NewReturnDropdown() {
   var defaultSelectStyle = {
     width: '100%'
   };
   var defaultPopupClassName = 'dropDownStyle';
-  var defaultSelectWrapperClass = 'rounded';
-  return React__default.createElement(Container$D, null, React__default.createElement(Text$3, null, "New Return Order:"), React__default.createElement(dmsComponentLibrary.AntSelect, {
-    options: [],
+  var _useState = React.useState([]),
+    returnOrderData = _useState[0],
+    setReturnOrderData = _useState[1];
+  var _useState2 = React.useState(null),
+    selectedOrderId = _useState2[0],
+    setSelectedOrderId = _useState2[1];
+  var _useSelectedProducts = useSelectedProducts(),
+    selectedProducts = _useSelectedProducts[0];
+  var _useOrderDetails = useOrderDetails(),
+    orderData = _useOrderDetails[0];
+  var _useAtom = jotai.useAtom(payloadAtom),
+    setPayload = _useAtom[1];
+  var _useProductDetails = useProductDetails(),
+    productData = _useProductDetails[0];
+  var _useState3 = React.useState(),
+    idProduct = _useState3[0],
+    setId = _useState3[1];
+  var id = orderData == null ? void 0 : orderData.customer_id;
+  React.useEffect(function () {
+    var allProductIds = (productData == null ? void 0 : productData.map(function (product) {
+      return product.return_location;
+    })) || [];
+    setId(allProductIds);
+  }, [productData]);
+  var filters = [{
+    field: 'customer_id',
+    op: '=',
+    value: id
+  }, {
+    field: 'is_deleted',
+    op: '=',
+    value: 0
+  }, {
+    field: 'status',
+    op: '!=',
+    value: 'SD'
+  }];
+  if ((idProduct == null ? void 0 : idProduct.length) > 0 && idProduct[0]) {
+    filters.push({
+      field: 'return_order_products.return_location',
+      op: '=',
+      value: idProduct[0]
+    });
+  }
+  var _useApiHook = dmsComponentLibrary.useApiHook({
+      endpoint: '/return_orders/?skip_filters=0',
+      method: 'GET',
+      filters: filters,
+      //@ts-ignore
+      pagination: {
+        is_pagination: false
+      },
+      performAction: false
+    }),
+    fetchedReturnOrderData = _useApiHook.data,
+    setShouldPerformAction = _useApiHook.setShouldPerformAction;
+  React.useEffect(function () {
+    if (id && (idProduct == null ? void 0 : idProduct.length) > 0 && idProduct[0]) {
+      setShouldPerformAction(true);
+    }
+  }, [id, idProduct, setShouldPerformAction]);
+  React.useEffect(function () {
+    if (fetchedReturnOrderData && fetchedReturnOrderData != null && fetchedReturnOrderData.data && id !== null) {
+      setReturnOrderData(fetchedReturnOrderData == null ? void 0 : fetchedReturnOrderData.data);
+    }
+  }, [fetchedReturnOrderData, id]);
+  React.useEffect(function () {
+    if (selectedOrderId && (selectedProducts == null ? void 0 : selectedProducts.length) > 0) {
+      var newPayload = {
+        new_return_order: selectedOrderId,
+        products: selectedProducts
+      };
+      setPayload(newPayload);
+    }
+  }, [selectedOrderId, selectedProducts, setPayload]);
+  var handleDropdownChange = function handleDropdownChange(value) {
+    setSelectedOrderId(value);
+  };
+  var dropdownOptions = returnOrderData == null ? void 0 : returnOrderData.map(function (order) {
+    return {
+      label: order.order_recipient.recipient_name + " - " + order.order_recipient.postcode,
+      value: order.id
+    };
+  });
+  return React__default.createElement(Container$D, null, React__default.createElement(Text$3, null, "New Return Order:"), React__default.createElement(antd.Select, {
+    options: dropdownOptions,
     placeholder: "Select",
-    onChange: function onChange() {},
-    defaultValue: 'Current Return Order' ,
+    onChange: handleDropdownChange,
     style: defaultSelectStyle,
     disabled: false,
-    // onSearch={handleSearch}
     showSearch: true,
-    popupClassName: defaultPopupClassName,
-    selectWrapperClass: defaultSelectWrapperClass
+    dropdownStyle: {
+      width: 'max-content'
+    },
+    popupClassName: defaultPopupClassName
   }));
 };
-var Container$D = /*#__PURE__*/styled__default.div(_templateObject$W || (_templateObject$W = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  gap: 10px;\n  align-self: stretch;\n"])));
-var Text$3 = /*#__PURE__*/styled__default.div(_templateObject2$H || (_templateObject2$H = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: #000;\n\n  /* body/captions */\n  font-family: 'Lato';\n  font-size: 13px;\n  font-style: normal;\n  font-weight: 400;\n  line-height: 16px; /* 123.077% */\n"])));
+var Container$D = /*#__PURE__*/styled__default.div(_templateObject$W || (_templateObject$W = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  gap: 10px;\n  align-self: stretch;\n  white-space: nowrap;\n"])));
+var Text$3 = /*#__PURE__*/styled__default.div(_templateObject2$H || (_templateObject2$H = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: #000;\n  font-family: 'Lato';\n  font-size: 13px;\n  font-weight: 400;\n  line-height: 16px;\n"])));
 var _templateObject$X, _templateObject2$I, _templateObject3$n;
-// import { notification } from 'antd';
 function ExpandedContent$2() {
-  // const SaveNote = () => {
-  //   // alert('saved');
-  //   notification.success({
-  //     message: 'Success',
-  //     description: ' Saved successfully.',
-  //   });
-  // };
-  return React__default.createElement(Container$E, null, React__default.createElement(ProductTable, null), React__default.createElement(MidConatiner, null, React__default.createElement(SaveNoteContainer$1, null, React__default.createElement(dmsComponentLibrary.Button, {
+  var _response$data, _response$data2;
+  var _useAtom = jotai.useAtom(payloadAtom),
+    payload = _useAtom[0];
+  var _usePostLoading = usePostLoading(),
+    setPostLoading = _usePostLoading[1];
+  var _useOrderId = useOrderId(),
+    orderId = _useOrderId[0];
+  var _useState = React.useState(true),
+    isButtonDisabled = _useState[0],
+    setIsButtonDisabled = _useState[1];
+  var navigate = reactRouterDom.useNavigate();
+  var _useSelectedProducts = useSelectedProducts(),
+    setSelectedProducts = _useSelectedProducts[1];
+  var _useApiHook = dmsComponentLibrary.useApiHook({
+      endpoint: "return_order_products/move/" + orderId,
+      method: 'POST',
+      body: payload,
+      performAction: false
+    }),
+    response = _useApiHook.data,
+    setShouldPerformAction = _useApiHook.setShouldPerformAction,
+    confirmLoading = _useApiHook.loading;
+  React.useEffect(function () {
+    setPostLoading(confirmLoading);
+  }, [confirmLoading, setPostLoading]);
+  React.useEffect(function () {
+    var _payload$products;
+    if (payload != null && payload.new_return_order && (payload == null || (_payload$products = payload.products) == null ? void 0 : _payload$products.length) > 0) {
+      setIsButtonDisabled(false);
+    } else {
+      setIsButtonDisabled(true);
+    }
+  }, [payload]);
+  var handleConfirmReturn = function handleConfirmReturn() {
+    if (!isButtonDisabled) {
+      setShouldPerformAction(true);
+      setPostLoading(confirmLoading);
+    } else {
+      console.error('Payload is incomplete:', payload);
+    }
+  };
+  var newId = Array.isArray(response == null ? void 0 : response.data) ? //@ts-ignore
+  response == null || (_response$data = response.data) == null || (_response$data = _response$data[0]) == null ? void 0 : _response$data.id : //@ts-ignore
+  response == null || (_response$data2 = response.data) == null ? void 0 : _response$data2.id;
+  React.useEffect(function () {
+    //@ts-ignore
+    if ((response == null ? void 0 : response.code) === 200) {
+      antd.notification.success({
+        message: 'Success',
+        //@ts-ignore
+        description: (response == null ? void 0 : response.message) || 'Products moved successfully'
+      });
+      setSelectedProducts([]);
+    } else if (response) {
+      antd.notification.error({
+        message: 'Error',
+        //@ts-ignore
+        description: (response == null ? void 0 : response.message) || 'Error while moving products'
+      });
+    }
+    //@ts-ignore
+    if ((response == null ? void 0 : response.code) === 200 && newId) {
+      navigate("details/" + newId);
+      setSelectedProducts([]);
+    }
+  }, [response, newId, navigate, setSelectedProducts]);
+  return React__default.createElement(Container$E, null, React__default.createElement(ProductTable, null), React__default.createElement(MidContainer, null, React__default.createElement(SaveNoteContainer$1, null, React__default.createElement(dmsComponentLibrary.Button, {
     style: {
       borderRadius: '20px'
     },
-    onClick: function onClick() {},
-    disabled: true
+    onClick: handleConfirmReturn,
+    disabled: isButtonDisabled
   }, "Move Products"), React__default.createElement(NewReturnDropdown, null))));
 }
-var MidConatiner = /*#__PURE__*/styled__default.div(_templateObject$X || (_templateObject$X = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: space-between;\n  padding: 10px 15px;\n  align-items: flex-start;\n  border-top: 1px solid #edebe8;\n  background: #f8fafc;\n  margin: 0px -15px -15px -15px;\n  border-radius: 0px 0px 8px 8px;\n  margin-bottom: 22px;\n"])));
+var MidContainer = /*#__PURE__*/styled__default.div(_templateObject$X || (_templateObject$X = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: space-between;\n  padding: 10px 15px;\n  align-items: flex-start;\n  border-top: 1px solid #edebe8;\n  background: #f8fafc;\n  margin: 0px -15px -15px -15px;\n  border-radius: 0px 0px 8px 8px;\n  margin-bottom: 22px;\n"])));
 var SaveNoteContainer$1 = /*#__PURE__*/styled__default.div(_templateObject2$I || (_templateObject2$I = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: inline-flex;\n  gap: 10px;\n"])));
 var Container$E = /*#__PURE__*/styled__default.div(_templateObject3$n || (_templateObject3$n = /*#__PURE__*/_taggedTemplateLiteralLoose([""])));
@@ -3761,6 +3930,10 @@ 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);
@@ -3816,7 +3989,7 @@ function ProductsInfo() {
   var _useLoading = useLoading(),
     setLoading = _useLoading[1];
   var _useApiHook = dmsComponentLibrary.useApiHook({
-      endpoint: "/order/order_products/" + customerData.id,
+      endpoint: "return_order_products/" + customerData.id,
       method: 'GET',
       performAction: false
     }),
@@ -8077,11 +8250,10 @@ var OptionsDropDown = function OptionsDropDown() {
     setIsOpen = _useState[1];
   var dropdownRef = React.useRef(null);
   var _useCurrentAction = useCurrentAction(),
-    action = _useCurrentAction[0],
     setCurrentAction = _useCurrentAction[1];
   var _useIsOnHoldOrder = useIsOnHoldOrder(),
     hold = _useIsOnHoldOrder[0];
-  console.log(action, 'action');
+  // console.log(action, 'action');
   var handleClick = function handleClick() {
     setIsOpen(function (prev) {
       return !prev;
@@ -8095,7 +8267,6 @@ var OptionsDropDown = function OptionsDropDown() {
     }
   });
   var handleSelect = function handleSelect(selectedOption) {
-    console.log(selectedOption);
     setCurrentAction(selectedOption);
     setIsOpen(false);
   };
@@ -8172,7 +8343,7 @@ function Print() {
     orderDetails = _useOrderDetails[0];
   var gsitId = orderDetails == null ? void 0 : orderDetails.gsit_order_id;
   var dropdownRef = React.useRef(null);
-  console.log(gsitId, 'gsitId');
+  // console.log(gsitId, 'gsitId');
   var _useState = React.useState(false),
     isOpen = _useState[0],
     setIsOpen = _useState[1];
@@ -8560,7 +8731,11 @@ var ApplyButton = /*#__PURE__*/styled__default.button(_templateObject14$2 || (_t
 // let todayDate = new Date();
 var initialState$1 = {
-  'x-filters': [],
+  'x-filters': [{
+    field: 'isdeleted',
+    op: '=',
+    value: 0
+  }],
   'x-pagination': {
     page: 1,
     per_page: 50
@@ -8599,9 +8774,9 @@ var filterReducer = function filterReducer(state, action) {
     case 'SET_ACTIONS_FILTER':
       return _extends({}, state, {
         'x-filters': [].concat(state['x-filters'].filter(function (f) {
-          return f.field !== 'product_return_action_id';
+          return f.field !== 'order_product_return_action.type';
         }), [{
-          field: 'product_return_action_id',
+          field: 'order_product_return_action.type',
           op: '=',
           value: action.payload
         }])
@@ -8625,7 +8800,7 @@ var filterReducer = function filterReducer(state, action) {
     case 'CLEAR_ACTION':
       return _extends({}, state, {
         'x-filters': state['x-filters'].filter(function (f) {
-          return f.field !== 'product_return_action_id';
+          return f.field !== 'order_product_return_action.type';
         })
       });
     case 'CLEAR_LOC':
@@ -8665,15 +8840,6 @@ var _templateObject$1R;
 function SelectionFilter() {
   var _useCustomerData = useCustomerData(),
     customers = _useCustomerData[0];
-  var _useActionType = useActionType(),
-    actionType = _useActionType[0];
-  var _useLocationData = useLocationData(),
-    locationData = _useLocationData[0];
-  var _useState = React.useState([]),
-    filteredLocationOptions = _useState[0],
-    setFilteredLocationOptions = _useState[1];
-  var _useState2 = React.useState(),
-    setUuid = _useState2[1];
   var _useSelectedAction = useSelectedAction(),
     selectedFilterValue = _useSelectedAction[0],
     setSelectedFilterValue = _useSelectedAction[1];
@@ -8683,138 +8849,98 @@ function SelectionFilter() {
     selectedLocationValue = _useSelectedLocation[0],
     setSelectedLocationValue = _useSelectedLocation[1];
   var _useSelectedClient = useSelectedClient(),
+    selectedClient = _useSelectedClient[0],
     setSelectedClient = _useSelectedClient[1];
-  var _useTableName = useTableName(),
-    setClientLabel = _useTableName[1];
-  var _useState3 = React.useState(),
-    setName = _useState3[1];
-  var _useState4 = React.useState(false),
-    isButtonEnabled = _useState4[0],
-    setIsButtonEnabled = _useState4[1];
+  var _useIdForTableName = useIdForTableName(),
+    setClientIdForTable = _useIdForTableName[1];
+  var _useState = React.useState(false),
+    isButtonEnabled = _useState[0],
+    setIsButtonEnabled = _useState[1];
   var _useReturnPayload = useReturnPayload(),
     setReturnPayload = _useReturnPayload[1];
-  var _useState5 = React.useState(),
-    storedAccNumber = _useState5[0],
-    setStoredAccNumber = _useState5[1];
-  var _useState6 = React.useState(),
-    storedCustomerId = _useState6[0],
-    setStoredCustomerId = _useState6[1];
-  var _useNewReturnPayload = useNewReturnPayload(),
-    setNewPayload = _useNewReturnPayload[1];
-  var _useGroupedPayload = useGroupedPayload(),
-    setGrouped = _useGroupedPayload[1];
-  var _useSelectedOrders = useSelectedOrders(),
-    setSelectedReturnOrder = _useSelectedOrders[1];
-  var _useSelectAll = useSelectAll(),
-    setSelectAll = _useSelectAll[1];
-  var _useSelectedConfirmLo = useSelectedConfirmLoc(),
-    setCheck = _useSelectedConfirmLo[1];
+  var _useLoading = useLoading(),
+    load = _useLoading[0];
+  var _useTableName = useTableName(),
+    setTableName = _useTableName[1];
   var _useClearState = useClearState(),
     clearState = _useClearState[0],
     setClear = _useClearState[1];
-  //client options
+  var _useActionTypeOptions = useActionTypeOptions(),
+    actionTypeOptions = _useActionTypeOptions[0],
+    setActionTypeOptions = _useActionTypeOptions[1];
+  var _useLocationOptions = useLocationOptions(),
+    locationOptions = _useLocationOptions[0],
+    setLocationOptions = _useLocationOptions[1];
   var clientOptions = customers == null ? void 0 : customers.map(function (option) {
     var _option$customer_name, _option$customer_name2;
     return {
       label: (option == null || (_option$customer_name = option.customer_name) == null || (_option$customer_name = _option$customer_name.charAt(0)) == null ? void 0 : _option$customer_name.toUpperCase()) + (option == null || (_option$customer_name2 = option.customer_name) == null ? void 0 : _option$customer_name2.slice(1)),
-      value: (option == null ? void 0 : option.id) + "_" + (option == null ? void 0 : option.uuid),
-      id: option == null ? void 0 : option.id,
-      uuid: option == null ? void 0 : option.uuid,
-      account_number: option == null ? void 0 : option.account_number,
-      gsit_customer_id: option == null ? void 0 : option.gsit_customer_id
-    };
-  });
-  var actionTypeOptions = actionType == null ? void 0 : actionType.map(function (option) {
-    var _option$type, _option$type2;
-    return {
-      label: (option == null || (_option$type = option.type) == null || (_option$type = _option$type.charAt(0)) == null ? void 0 : _option$type.toUpperCase()) + (option == null || (_option$type2 = option.type) == null ? void 0 : _option$type2.slice(1)),
-      value: option == null ? void 0 : option.id
-    };
-  });
-  var LocationOptions = locationData == null ? void 0 : locationData.map(function (option) {
-    return {
-      label: option == null ? void 0 : option.location_name,
-      value: option == null ? void 0 : option.token
+      value: option == null ? void 0 : option.customer_id,
+      actions: option == null ? void 0 : option.actions,
+      return_locations: option == null ? void 0 : option.return_locations,
+      account_number: option == null ? void 0 : option.account_number
     };
   });
   //client change
-  var handleSelectChange = function handleSelectChange(_value, option) {
-    setNewPayload([]);
-    var selectedLabel = option == null ? void 0 : option.label;
-    var selectedValue = option == null ? void 0 : option.id;
-    var selectedUuids = option == null ? void 0 : option.uuid;
-    var selectAccountNumber = option == null ? void 0 : option.account_number;
-    var selectedCustomerId = option == null ? void 0 : option.gsit_customer_id;
-    setSelectedClient(selectedValue);
-    setName(selectedLabel);
-    // storedName(selectedLabel);
-    //set items in local storage
-    localStorage.setItem('clientName', selectedLabel);
-    localStorage.setItem('clientId', selectedValue == null ? void 0 : selectedValue.toString());
-    localStorage.setItem('account_number', selectAccountNumber);
-    localStorage.setItem('uuid', selectedUuids);
-    localStorage.setItem('customer_id', selectedCustomerId == null ? void 0 : selectedCustomerId.toString());
-    var storedAccNo = localStorage.getItem('account_number');
-    var storedCustomerId = localStorage.getItem('customer_id');
-    var storedUuid = localStorage.getItem('uuid');
-    setUuid(storedUuid);
+  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);
     //set payload
     setReturnPayload(function (prevState) {
       return _extends({}, prevState, {
-        account_number: storedAccNo,
-        customer_id: storedCustomerId
+        account_number: option == null ? void 0 : option.account_number,
+        customer_id: value
       });
     });
-    //filtering locations
-    var filteredSubLocations = locationData == null ? void 0 : locationData.filter(function (subCat) {
-      return (subCat == null ? void 0 : subCat.customer_id) === storedUuid;
-    }).map(function (subCat) {
-      return {
-        label: subCat == null ? void 0 : subCat.location_name,
-        value: subCat == null ? void 0 : subCat.token
-      };
-    });
-    setFilteredLocationOptions(filteredSubLocations);
-    //clearing states
-    setUuid('');
-    setSelectedReturnOrder([]);
-    setNewPayload([]);
-    setGrouped([]);
-    setSelectAll(false);
-    setCheck([]);
   };
+  var storedName = localStorage.getItem('clientName');
+  var storedClientId = localStorage.getItem('clientId');
+  var storedAccountNumber = localStorage.getItem('account_number');
   React.useEffect(function () {
-    var accountNumberFromStorage = localStorage.getItem('account_number');
-    var customerIdFromStorage = localStorage.getItem('customer_id');
-    if (accountNumberFromStorage) {
-      setStoredAccNumber(accountNumberFromStorage);
-    }
-    if (customerIdFromStorage) {
-      setStoredCustomerId(customerIdFromStorage);
+    if (storedClientId !== selectedClient) {
+      localStorage.removeItem('clientDetails');
+      localStorage.removeItem('clientActions');
+      localStorage.removeItem('clientLocations');
     }
-    if (storedAccNumber && storedCustomerId) {
+  }, [storedClientId]);
+  React.useEffect(function () {
+    if (storedClientId && storedAccountNumber) {
       setReturnPayload(function (prevState) {
         return _extends({}, prevState, {
-          account_number: storedAccNumber,
-          customer_id: storedCustomerId
+          account_number: storedAccountNumber,
+          customer_id: storedClientId
         });
       });
     }
-  }, [storedAccNumber, storedCustomerId]);
-  var storedUuid = localStorage.getItem('uuid');
+  }, [storedClientId, storedAccountNumber]);
   React.useEffect(function () {
-    if (storedUuid && locationData) {
-      var filteredSubLocations = locationData.filter(function (subCat) {
-        return (subCat == null ? void 0 : subCat.customer_id) === storedUuid;
-      }).map(function (subCat) {
-        return {
-          label: subCat == null ? void 0 : subCat.location_name,
-          value: subCat == null ? void 0 : subCat.token
-        };
+    var storedClientId = localStorage.getItem('clientId');
+    if (storedClientId && (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;
       });
-      setFilteredLocationOptions(filteredSubLocations);
+      if (filteredClient) {
+        var _filteredClient$actio, _filteredClient$retur;
+        var mappedActions = filteredClient == null || (_filteredClient$actio = filteredClient.actions) == null ? void 0 : _filteredClient$actio.map(function (action) {
+          return {
+            label: action,
+            value: action
+          };
+        });
+        setActionTypeOptions(mappedActions);
+        var mappedLocations = filteredClient == null || (_filteredClient$retur = filteredClient.return_locations) == null ? void 0 : _filteredClient$retur.map(function (location) {
+          return {
+            label: location,
+            value: location
+          };
+        });
+        setLocationOptions(mappedLocations);
+      }
     }
-  }, [storedUuid, locationData]);
+  }, [load]);
   //location change
   var handleLocationChange = function handleLocationChange(value) {
     setSelectedLocationValue(value);
@@ -8825,9 +8951,29 @@ function SelectionFilter() {
   };
   //Apply filters
   var applyFilters = function applyFilters() {
+    if (selectedClient) {
+      setClientIdForTable(selectedClient);
+    }
     if (storedName) {
-      setClientLabel(storedName);
+      setTableName(storedName);
     }
+    var selectedClientValue = clientOptions == null ? void 0 : clientOptions.find(function (client) {
+      return (client == null ? void 0 : client.value) === selectedClient;
+    });
+    var clientActions = (selectedClientValue == null ? void 0 : selectedClientValue.actions) || [];
+    var clientLocations = (selectedClientValue == null ? void 0 : selectedClientValue.return_locations) || [];
+    setActionTypeOptions(clientActions == null ? void 0 : clientActions.map(function (action) {
+      return {
+        label: action,
+        value: action
+      };
+    }));
+    setLocationOptions(clientLocations == null ? void 0 : clientLocations.map(function (action) {
+      return {
+        label: action,
+        value: action
+      };
+    }));
     //client value
     if (storedClientId) {
       dispatch({
@@ -8867,8 +9013,7 @@ function SelectionFilter() {
       });
     }
   };
-  var storedName = localStorage.getItem('clientName');
-  var storedClientId = localStorage.getItem('clientId');
+  // const storedName = localStorage.getItem('clientName');
   React.useEffect(function () {
     if (storedClientId) {
       dispatch({
@@ -8878,12 +9023,12 @@ function SelectionFilter() {
     }
   }, []);
   React.useEffect(function () {
-    if (storedName || selectedFilterValue || selectedLocationValue) {
+    if (storedClientId || selectedFilterValue || selectedLocationValue) {
       setIsButtonEnabled(true);
     } else {
       setIsButtonEnabled(false);
     }
-  }, [storedName, selectedFilterValue, selectedLocationValue]);
+  }, [storedClientId, selectedFilterValue, selectedLocationValue]);
   React.useEffect(function () {}, [location.pathname]);
   React.useEffect(function () {
     if (!selectedFilterValue || selectedFilterValue === null) {
@@ -8899,8 +9044,7 @@ function SelectionFilter() {
   }, [selectedFilterValue, selectedLocationValue]);
   var handleClear = function handleClear() {
     setClear(false);
-    localStorage.removeItem('clientName');
-    localStorage.removeItem('clientId');
+    localStorage.removeItem('clientDetails');
     setClear(true);
   };
   React.useEffect(function () {
@@ -8908,21 +9052,20 @@ function SelectionFilter() {
       dispatch({
         type: 'CLEAR_CLIENT'
       });
-      // window.location.href = '/returnclient';
-      window.location.replace('/returnclient');
+      window.location.href = '/returnclient';
     }
   }, [clearState]);
   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: handleSelectChange,
+    onChange: handleClientChange,
     style: {
       minWidth: '14vw'
     },
     value: storedName,
     allowClear: true,
     onClear: handleClear
-  })), 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$2, {
+  })), 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, {
     options: actionTypeOptions,
     placeholder: "Select Action Type",
     value: selectedFilterValue,
@@ -8932,7 +9075,7 @@ function SelectionFilter() {
     },
     allowClear: true
   })), React__default.createElement(FilterColumn, null, React__default.createElement(Label$g, null, "Location "), React__default.createElement(StyledAntSelect$2, {
-    options: (filteredLocationOptions == null ? void 0 : filteredLocationOptions.length) > 0 ? filteredLocationOptions : LocationOptions,
+    options: locationOptions,
     value: selectedLocationValue,
     placeholder: "Select Location",
     onChange: handleLocationChange,
@@ -8941,7 +9084,7 @@ function SelectionFilter() {
     },
     allowClear: true,
     mode: "multiple"
-  }))) : null), 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"))));
@@ -9050,9 +9193,8 @@ 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 _useParams = reactRouterDom.useParams(),
-    clientName = _useParams.clientName;
-  return React__default.createElement(React__default.Fragment, null, React__default.createElement(StyledFiter, null, React__default.createElement(Text$8, null, " ", clientName), React__default.createElement(StyledFIlterELements, null, React__default.createElement(StyledTableFilter, null)), React__default.createElement(RightFilters, null)));
+  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 _templateObject$1U, _templateObject2$1o, _templateObject3$Q, _templateObject4$u, _templateObject34, _templateObject35, _templateObject36, _templateObject37;
@@ -9063,7 +9205,7 @@ var StyledTableWrapper$2 = /*#__PURE__*/styled__default.div(_templateObject3$Q |
 var StyledTable$3 = /*#__PURE__*/styled__default.table(_templateObject4$u || (_templateObject4$u = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  border-spacing: 0 10px;\n  width: 100%;\n  /* min-width: 1600px; */\n  thead {\n    tr {\n      border-radius: 40px;\n      border-spacing: 0 10px;\n      font-family: 'lato', sans-serif;\n      .emailInvoiceCheckbox {\n        padding-right: 0px;\n        width: 0;\n        > div {\n          width: fit-content;\n        }\n      }\n      .emailInvoiceNo {\n        padding-left: 12px;\n      }\n      .emailInvoiceShare {\n        width: 100px;\n      }\n      th {\n        color: #3a3630;\n        font-size: 14px;\n        font-style: normal;\n        font-weight: 600;\n        line-height: normal;\n        padding: 11px 15px;\n        background: #f0f2f2;\n        border-right: none;\n        border-left: none;\n        text-align: left;\n        border: 1px solid rgba(0, 0, 0, 0.08);\n        border-width: 1px 0;\n        &:first-child {\n          border-radius: 100px 0 0 100px;\n          border-left: 1px solid rgba(0, 0, 0, 0.08);\n        }\n        &:last-child {\n          border-radius: 0px 100px 100px 0;\n          border-right: 1px solid rgba(0, 0, 0, 0.08);\n        }\n      }\n    }\n  }\n  tbody {\n    tr {\n      td {\n        color: #3a3630;\n        font-size: 13px;\n        font-style: normal;\n        font-weight: 400;\n        line-height: normal;\n        padding: 12px 15px;\n        background: #fff;\n        border: 1px solid rgba(0, 0, 0, 0.08);\n        border-right: none;\n        border-left: none;\n\n        .shareIconContainer {\n          display: flex;\n          width: 24px;\n          height: 24px;\n          flex-direction: column;\n          justify-content: center;\n          align-items: center;\n          gap: 10px;\n          flex-shrink: 0;\n          border-radius: 15px;\n          background: #edebe8;\n          cursor: pointer;\n        }\n        .statuscontainer {\n          display: flex;\n          padding: 6px 10px;\n          justify-content: center;\n          align-items: center;\n          gap: 5px;\n          flex: 1 0 0;\n          border-radius: 22px;\n          background: rgba(41, 204, 106, 0.15);\n        }\n      }\n      &:nth-child(even) td {\n        background: #f6fbff;\n      }\n      td:first-child {\n        border-radius: 100px 0 0 100px;\n        border-left: 1px solid rgba(0, 0, 0, 0.08);\n      }\n      td:last-child {\n        border-radius: 0px 100px 100px 0;\n        border-right: 1px solid rgba(0, 0, 0, 0.08);\n      }\n      .flex {\n        display: flex;\n        flex-direction: row;\n        gap: 5px;\n        height: 29px;\n        align-items: center;\n      }\n\n      &.insideTable {\n        td {\n          border-radius: 0;\n          border: none;\n          &:last-child {\n            border-radius: 0;\n            border-right: none;\n          }\n        }\n        table {\n          border-spacing: 0;\n          width: 100%;\n          border-radius: 5px;\n          border: 1px solid rgba(0, 0, 0, 0.08);\n          overflow: hidden;\n          border-top-left-radius: 15px;\n          border-top-right-radius: 15px;\n          thead {\n            tr {\n              border-bottom: none;\n              th {\n                padding: 14px 20px;\n                text-align: left;\n                border-top: 0;\n                border-right: 0;\n                border-left: 0;\n                background: #f8fafc;\n\n                &:first-child {\n                  border-radius: 0;\n                  border-left: 1px solid rgba(0, 0, 0, 0.08);\n                  border-top-left-radius: 15px;\n                }\n                &:last-child {\n                  border-radius: 0;\n                }\n              }\n            }\n          }\n          tbody {\n            tr {\n              td {\n                padding: 14px 20px;\n                text-align: left;\n                border-bottom: 1px solid rgba(58, 54, 48, 0.15);\n                background: #fff;\n                > svg {\n                  transform: scale(1.5);\n                  background-color: #edebe8;\n                  border-radius: 20px;\n                  padding: 5px;\n                }\n                &:last-child {\n                  border-radius: 0;\n                  border-right: none;\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n  .actions {\n    display: flex;\n    align-items: center;\n    gap: 20px;\n    > svg {\n      transform: scale(1.5);\n      background-color: #edebe8;\n      border-radius: 20px;\n      padding: 5px;\n    }\n\n    .close-icon {\n      transform: scale(1.3);\n      background-color: transparent;\n      border-radius: 0;\n      padding: 0;\n    }\n  }\n"])));
 var EmptyDataContainer$1 = /*#__PURE__*/styled__default.div(_templateObject34 || (_templateObject34 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: center;\n"])));
 var ClearAll = /*#__PURE__*/styled__default.div(_templateObject35 || (_templateObject35 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  border-radius: 20px;\n  border: 1px solid #edebe8;\n  background: #fff;\n  display: flex;\n  padding: 6px 6px;\n  justify-content: center;\n  align-items: center;\n  gap: 8px;\n  cursor: pointer;\n\n  &.active {\n    background: #313130;\n    & > div {\n      color: #fff;\n    }\n  }\n"])));
-var StyledFilterBtnIcon = /*#__PURE__*/styled__default.div(_templateObject36 || (_templateObject36 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  width: 24px;\n  height: 24px;\n  justify-content: center;\n  align-items: center;\n  border-radius: 20px;\n  border: 1px solid #e2e0db;\n  background: #f1f5f6;\n  .cross {\n    position: relative;\n    &:after {\n      display: inline-block;\n      content: 'X';\n      font-style: normal;\n      font-size: 14px;\n      color: #000;\n    }\n  }\n"])));
+var StyledFilterBtnIcon = /*#__PURE__*/styled__default.div(_templateObject36 || (_templateObject36 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  width: 24px;\n  height: 24px;\n  justify-content: center;\n  align-items: center;\n  border-radius: 20px;\n  border: 1px solid #e2e0db;\n  background: #b2b3b3;\n  .cross {\n    position: relative;\n    &:after {\n      display: inline-block;\n      content: 'X';\n      font-style: normal;\n      font-size: 14px;\n      color: #000;\n    }\n  }\n"])));
 var StyledFilterBtnLabel = /*#__PURE__*/styled__default.div(_templateObject37 || (_templateObject37 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: #6a7378;\n  font-size: 13px;\n  font-style: normal;\n  font-weight: 400;\n  line-height: 16px;\n  white-space: nowrap;\n"])));
 var PrinterIcon = function PrinterIcon() {
@@ -9254,7 +9396,7 @@ var PrintDropDownReturn = function PrintDropDownReturn(_ref) {
   var legacyProductId = _ref.legacyProductId;
   console.log(legacyProductId, 'legacyProductId');
   var downloadFiles = function downloadFiles() {
-    var url = "https://toolbox.bjshomedelivery.com/offload/return_label?gsit_products_id=" + legacyProductId;
+    var url = "https://us.toolbox.bjshomedelivery.com/offload/return_label?gsit_products_id=" + legacyProductId;
     window.open(url, '_blank'); // Opens the URL in a new tab
   };
   return React__default.createElement(OptionsList, null, options == null ? void 0 : options.map(function (item, index) {
@@ -9434,7 +9576,7 @@ var ReturnOrderTable = function ReturnOrderTable() {
           account_number: createReturn == null ? void 0 : createReturn.account_number,
           customer_id: +(createReturn == null ? void 0 : createReturn.customer_id),
           products: [legacy_product_id],
-          return_action: [order_product_return_action == null ? void 0 : order_product_return_action.type] || null,
+          return_action: order_product_return_action != null && order_product_return_action.type ? [order_product_return_action.type] : null,
           return_location_token: return_location || null
         };
         setNewPayload(function (prevPayload) {
@@ -9489,7 +9631,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, "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, "Return Action"), 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: 13
@@ -9498,7 +9640,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$return_reasons, _item$order_product_r3, _item$collection_reas;
+    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;
     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, {
@@ -9526,7 +9668,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 ? 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) {
+    }, 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) {
       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"
@@ -9688,8 +9830,6 @@ var ModalManager = function ModalManager() {
     popupName = _useAtom[0],
     dispatch = _useAtom[1];
   var _useProductDetails = useProductDetails();
-  var _useCreateOrderProduc = useCreateOrderProducts(),
-    orderProduct = _useCreateOrderProduc[0];
   var _useDeleteProdsID = useDeleteProdsID(),
     selectedRows = _useDeleteProdsID[0];
   var _useState = React.useState(false),
@@ -9713,14 +9853,12 @@ var ModalManager = function ModalManager() {
   var _usefetchAgain = usefetchAgain(),
     setCallForFetch = _usefetchAgain[1];
   var navigate = reactRouterDom.useNavigate();
-  console.log(orderProduct, 'abcabcabcabcabcabcabcabcabcabcabc');
   var _closeModal = function closeModal() {
     dispatch({
       type: 'close'
     });
   };
   var validateForm = function validateForm() {
-    console.log(selectedRows, 'selectedRowsselectedRowsselectedRows');
     return (selectedRows == null ? void 0 : selectedRows.length) > 0;
   };
   React.useEffect(function () {
@@ -9738,7 +9876,7 @@ var ModalManager = function ModalManager() {
     confirmLoading = _useApiHook.loading,
     apiError = _useApiHook.error,
     setError = _useApiHook.setError;
-  console.log(response, 'data'), React.useEffect(function () {
+  React.useEffect(function () {
     SetPostLoading(confirmLoading);
   }, [confirmLoading]);
   var handleConfirmReturn = function handleConfirmReturn() {
@@ -10070,20 +10208,29 @@ var OptionsListLi$1 = /*#__PURE__*/styled__default.li(_templateObject2$1u || (_t
   return disabled ? 'transparent' : '#f0f0f0';
 });
+var _templateObject$1$;
 var OrderTable = function OrderTable(_ref) {
   var loadingskeleton = _ref.loadingskeleton;
   // const [, setSelectedReturnOrder] = useSelectedOrders();
   // const [selectAll, setSelectAll] = useState(false);
-  // const defaultSelectStyle = { width: '100%' };
-  var defaultPopupClassName = 'dropDownStyle';
-  var defaultSelectWrapperClass = 'rounded';
   var dropdownRefParent = React.useRef(null);
   var dropdownRef = React.useRef(null);
   var _usePrintOptionTOggle = usePrintOptionTOggle(),
     printToogle = _usePrintOptionTOggle[0],
     setPrintToggle = _usePrintOptionTOggle[1];
+  var _useAssignData = useAssignData(),
+    assignData = _useAssignData[0];
+  var _useOrderId = useOrderId(),
+    setOrderId = _useOrderId[1];
   var _useReturnAfterOrderD = useReturnAfterOrderData(),
     returnAfterOrder = _useReturnAfterOrderD[0];
+  var _useAssignPayload = useAssignPayload(),
+    assignPayload = _useAssignPayload[0],
+    setAssignPayload = _useAssignPayload[1];
+  var _useState = React.useState(false),
+    setAssign = _useState[1];
+  var _useCallApiAgain = useCallApiAgain(),
+    setCallAPi = _useCallApiAgain[1];
   var OpenDropDown = function OpenDropDown(index) {
     setPrintToggle(function (prevIndex) {
       return prevIndex === index ? null : index;
@@ -10126,14 +10273,6 @@ var OrderTable = function OrderTable(_ref) {
   //     }
   //   });
   // };
-  // console.log('', returnAfterOrder);
-  var assigneOptions = [{
-    label: 'BJS Distribution',
-    value: 'bjs-dist'
-  }, {
-    label: 'Haulage',
-    value: 'haulage'
-  }];
   var getStatusClass = function getStatusClass(status) {
     switch (status) {
       case 'Cancelled':
@@ -10178,14 +10317,56 @@ var OrderTable = function OrderTable(_ref) {
         };
     }
   };
-  var _useOrderId = useOrderId(),
-    setOrderId = _useOrderId[1];
-  // console.log(id, 'idid');
-  return React__default.createElement(React__default.Fragment, null, React__default.createElement(StyledTableWrapper, {
+  // API for Assign
+  var _useApiHook = dmsComponentLibrary.useApiHook({
+      endpoint: "return_orders/update/assign/",
+      method: 'PUT',
+      body: [assignPayload],
+      performAction: false
+    }),
+    actionResponse = _useApiHook.data,
+    setAssignAction = _useApiHook.setShouldPerformAction,
+    AssignLoading = _useApiHook.loading,
+    apiError = _useApiHook.error;
+  //client options
+  var assignOptions = assignData == null ? void 0 : assignData.map(function (option) {
+    var _option$type, _option$type2;
+    return {
+      label: (option == null || (_option$type = option.type) == null || (_option$type = _option$type.charAt(0)) == null ? void 0 : _option$type.toUpperCase()) + (option == null || (_option$type2 = option.type) == null ? void 0 : _option$type2.slice(1)),
+      value: option == null ? void 0 : option.bjs_delivery
+    };
+  });
+  var handleAssignPayload = function handleAssignPayload(Id, value) {
+    setCallAPi(false);
+    setAssign(value);
+    setAssignPayload(_extends({}, assignPayload, {
+      return_order_id: Id,
+      bjs_delivery: value
+    }));
+    setAssignAction(true);
+  };
+  React.useEffect(function () {
+    //@ts-ignore
+    if ((actionResponse == null ? void 0 : actionResponse.code) === 200) {
+      setCallAPi(true);
+      antd.notification.success({
+        message: 'Success',
+        // @ts-ignore
+        description: "" + (actionResponse == null ? void 0 : actionResponse.message)
+      });
+      // @ts-ignore
+    } else if (apiError != null && apiError.detail) {
+      var _apiError$detail$;
+      antd.notification.error({
+        message: 'Failure',
+        // @ts-ignore
+        description: "" + (apiError == null || (_apiError$detail$ = apiError.detail[0]) == null ? void 0 : _apiError$detail$.msg)
+      });
+    }
+  }, [actionResponse, apiError]);
+  return React__default.createElement(React__default.Fragment, null, AssignLoading && React__default.createElement(Loader, null), React__default.createElement(StyledTableWrapper, {
     className: "fortables"
-  }, React__default.createElement(StyledTable$1, null, React__default.createElement("thead", null, React__default.createElement("tr", null, React__default.createElement("th", {
-    className: "emailInvoiceNo"
-  }, "Created"), React__default.createElement("th", null, "Return Location"), React__default.createElement("th", null, "Pick Up Location"), React__default.createElement("th", null, "Recipient"), React__default.createElement("th", null, " Client"), React__default.createElement("th", null, "Consignment"), React__default.createElement("th", null, "Return Order No"), React__default.createElement("th", null, " Total Parts"), React__default.createElement("th", null, "Total Weight"), React__default.createElement("th", null, "Total CBM"), React__default.createElement("th", null, "Assign"), React__default.createElement("th", null, "Status"), React__default.createElement("th", {
+  }, React__default.createElement(StyledTable$1, null, React__default.createElement("thead", null, React__default.createElement("tr", null, React__default.createElement("th", null, "Created"), React__default.createElement("th", null, "Return Location"), React__default.createElement("th", null, "Pick Up Location"), React__default.createElement("th", null, "Recipient"), React__default.createElement("th", null, " Client"), React__default.createElement("th", null, "Consignment"), React__default.createElement("th", null, "Return Order No"), React__default.createElement("th", null, " Total Parts"), React__default.createElement("th", null, "Total Weight"), React__default.createElement("th", null, "Total CBM"), React__default.createElement("th", null, "Assign"), React__default.createElement("th", null, "Status"), React__default.createElement("th", {
     className: "emailInvoiceShare"
   }, "Labels"))), React__default.createElement("tbody", null, loadingskeleton ? React__default.createElement("tr", null, React__default.createElement("td", {
     colSpan: 16
@@ -10231,17 +10412,18 @@ var OrderTable = function OrderTable(_ref) {
       style: {
         color: '#888075'
       }
-    }, displayValueOrNA(item == null || (_item$order_recipient2 = item.order_recipient) == null ? void 0 : _item$order_recipient2.postcode)))), React__default.createElement("td", null, displayValueOrNA(item == null || (_item$customer_data = item.customer_data) == null ? void 0 : _item$customer_data.customer_name)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.consignment)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.order_number)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.box_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, React__default.createElement(dmsComponentLibrary.AntSelect, {
-      options: assigneOptions,
+    }, displayValueOrNA(item == null || (_item$order_recipient2 = item.order_recipient) == null ? void 0 : _item$order_recipient2.postcode)))), React__default.createElement("td", null, displayValueOrNA(item == null || (_item$customer_data = item.customer_data) == null ? void 0 : _item$customer_data.customer_name)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.consignment)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.order_number)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.box_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", {
+      key: item.id
+    }, React__default.createElement(StyledAntSelect$3, {
+      options: assignOptions,
       placeholder: "Select",
-      onChange: function onChange() {},
-      // defaultValue={item?.assign || ''}
-      // style={defaultSelectStyle}
-      disabled // onSearch={handleSearch}
-      : true,
-      showSearch: true,
-      popupClassName: defaultPopupClassName,
-      selectWrapperClass: defaultSelectWrapperClass
+      onChange: function onChange(value) {
+        return handleAssignPayload(item == null ? void 0 : item.id, value);
+      },
+      style: {
+        width: '150px'
+      },
+      value: item == null ? void 0 : item.bjs_delivery
     })), React__default.createElement("td", null, React__default.createElement("ul", {
       className: "statuscontainer",
       style: {
@@ -10272,8 +10454,9 @@ var OrderTable = function OrderTable(_ref) {
     }, React__default.createElement(LoadIcon, null)))));
   })))));
 };
+var StyledAntSelect$3 = /*#__PURE__*/styled__default(antd.Select)(_templateObject$1$ || (_templateObject$1$ = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  .ant-select-selector {\n    /* width: 22vw; */\n    border-radius: 22px;\n  }\n  .ant-select-clear {\n    top: 40% !important;\n    font-size: 18px !important;\n  }\n"])));
-var _templateObject$1$;
+var _templateObject$20;
 // import DownloadIcon from '../../../../assets/icons/DownloadIcon';
 var TableFilters = function TableFilters() {
   return React__default.createElement(Container$16, null);
@@ -10290,7 +10473,7 @@ var TableFilters = function TableFilters() {
   //     // </StyledBulkFilterCover>
   //   );
 };
-var Container$16 = /*#__PURE__*/styled__default.div(_templateObject$1$ || (_templateObject$1$ = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  /* align-items: flex-start; */\n  gap: 16px;\n  align-items: center;\n"])));
+var Container$16 = /*#__PURE__*/styled__default.div(_templateObject$20 || (_templateObject$20 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  /* align-items: flex-start; */\n  gap: 16px;\n  align-items: center;\n"])));
 var FilterIcon = function FilterIcon() {
   return React__default.createElement("svg", {
@@ -10403,7 +10586,6 @@ var initialState$2 = {
   }
 };
 var filterReducer$1 = function filterReducer(state, action) {
-  console.log(action, 'action');
   switch (action.type) {
     case 'SET_DATE_FILTER':
       return _extends({}, state, {
@@ -10439,6 +10621,22 @@ var filterReducer$1 = function filterReducer(state, action) {
           value: action.payload
         }])
       });
+    // case 'CLEAR_CLIENT':
+    //   return {
+    //     ...state,
+    //     'x-filters': state['x-filters'].filter(f => f.field !== 'customer_id'),
+    //   };
+    // case 'CLEAR_STATUS_ORDER':
+    //   return {
+    //     ...state,
+    //     'x-filters': state['x-filters'].filter(f => f.field !== 'status_id'),
+    //   };
+    case 'CLEAR_DATE':
+      return _extends({}, state, {
+        'x-filters': state['x-filters'].filter(function (f) {
+          return f.field !== 'created_at';
+        })
+      });
     case 'SET_PAGE':
       return _extends({}, state, {
         'x-pagination': _extends({}, state['x-pagination'], {
@@ -10468,7 +10666,7 @@ var filtersReducerReturnAtom = /*#__PURE__*/jotai.atom(function (get) {
   return set(filtersStateAtom$1, filterReducer$1(get(filtersStateAtom$1), action));
 });
-var _templateObject$20, _templateObject2$1v;
+var _templateObject$21, _templateObject2$1v;
 var ReturnOrderFilter = function ReturnOrderFilter() {
   var _useAtom = jotai.useAtom(filtersReducerReturnAtom),
     dispatch = _useAtom[1];
@@ -10485,7 +10683,6 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
   var _useState3 = React.useState(),
     statusOrder = _useState3[0],
     setStatusOfOrder = _useState3[1];
-  console.log(selectedClient, 'fffffselectedClient');
   var zoneOptions = [{
     label: 'Zone 1',
     value: 'zone1'
@@ -10505,11 +10702,9 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
   // date change here
   var handleDateChange = function handleDateChange(date) {
     setSelectedDate(date ? date == null ? void 0 : date.$d : null);
-    console.log(selectedDate, 'selected');
   };
   React.useEffect(function () {
     if (selectedDate) {
-      console.log(selectedDate, 'selected');
       dispatch({
         type: 'SET_DATE_FILTER',
         payload: selectedDate
@@ -10526,10 +10721,9 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
     var _option$customer_name, _option$customer_name2;
     return {
       label: (option == null || (_option$customer_name = option.customer_name) == null || (_option$customer_name = _option$customer_name.charAt(0)) == null ? void 0 : _option$customer_name.toUpperCase()) + (option == null || (_option$customer_name2 = option.customer_name) == null ? void 0 : _option$customer_name2.slice(1)),
-      value: option == null ? void 0 : option.id
+      value: option == null ? void 0 : option.customer_id
     };
   });
-  console.log(clientOptions, 'clientOptions');
   //status of order
   var orderOptions = statusOfOrder == null ? void 0 : statusOfOrder.map(function (option) {
     var _option$status_type, _option$status_type2;
@@ -10540,7 +10734,6 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
   });
   var handleClientChange = function handleClientChange(value) {
     if (value === selectedClient) return;
-    console.log(value, 'value');
     setSelectedClient(value);
     dispatch({
       type: 'SET_CLIENT_FILTER',
@@ -10554,7 +10747,6 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
   };
   var handleStatusOfOrder = function handleStatusOfOrder(value) {
     if (value === statusOfOrder) return;
-    console.log(value, 'value');
     setStatusOfOrder(value);
     dispatch({
       type: 'SET_STATUS_ORDER_FILTER',
@@ -10574,6 +10766,14 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
       type: 'CLEAR_ALL_FILTER'
     });
   };
+  //clearing filters
+  React.useEffect(function () {
+    if (selectedDate === null) {
+      dispatch({
+        type: 'CLEAR_DATE'
+      });
+    }
+  }, [selectedDate]);
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(StyledFiter, null, React__default.createElement(StyledFIlterELements, null, React__default.createElement(LeftSideConatiner, null, React__default.createElement("div", {
     className: "filtercontainer"
   }, React__default.createElement("div", {
@@ -10593,12 +10793,13 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
     value: selectedDate ? dayjs(selectedDate) : null,
     format: "DD/MM/YY",
     placeholder: "Date",
-    needConfirm: true
+    needConfirm: true,
+    allowClear: true
   }))), React__default.createElement("div", {
     className: "datefilter"
   }, React__default.createElement("div", {
     className: "dateiconcontainer"
-  }, React__default.createElement(StatusIcon, null)), React__default.createElement(StyledAntSelect$3, null, React__default.createElement(antd.Select, {
+  }, React__default.createElement(StatusIcon, null)), React__default.createElement(StyledAntSelect$4, null, React__default.createElement(antd.Select, {
     options: orderOptions,
     className: "custom-select",
     placeholder: "Status of Order",
@@ -10611,7 +10812,7 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
     className: "datefilter"
   }, React__default.createElement("div", {
     className: "dateiconcontainer"
-  }, React__default.createElement(ClientIcon, null)), React__default.createElement(StyledAntSelect$3, null, React__default.createElement(antd.Select, {
+  }, React__default.createElement(ClientIcon, null)), React__default.createElement(StyledAntSelect$4, null, React__default.createElement(antd.Select, {
     options: clientOptions,
     className: "custom-select",
     placeholder: "Client",
@@ -10629,7 +10830,7 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
     }
   }, React__default.createElement("div", {
     className: "dateiconcontainer"
-  }, React__default.createElement(AssigneIcon, null)), React__default.createElement(StyledAntSelect$3, null, React__default.createElement(antd.Select, {
+  }, React__default.createElement(AssigneIcon, null)), React__default.createElement(StyledAntSelect$4, null, React__default.createElement(antd.Select, {
     options: zoneOptions,
     className: "custom-select",
     placeholder: "Asignee",
@@ -10644,9 +10845,9 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
     className: "cross"
   })), React__default.createElement(StyledFilterBtnLabel, null, "Clear all"))) : null)), React__default.createElement(TableFilters, null)));
 };
-var StyledDatePicker = /*#__PURE__*/styled__default.div(_templateObject$20 || (_templateObject$20 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  .custom-datepicker {\n    border: none;\n  }\n"])));
+var StyledDatePicker = /*#__PURE__*/styled__default.div(_templateObject$21 || (_templateObject$21 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  .custom-datepicker {\n    border: none;\n  }\n"])));
 // const DropdownContainer = styled.div``;
-var StyledAntSelect$3 = /*#__PURE__*/styled__default.div(_templateObject2$1v || (_templateObject2$1v = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  .custom-select {\n    border: none;\n    width: 80px;\n  }\n  .ant-select-selector {\n    border: 1px solid #ffffff !important;\n  }\n  :where(.css-dev-only-do-not-override-m4timi).ant-select-single:not(.ant-select-customize-input)\n    .ant-select-selector {\n    padding: 0 5px;\n  }\n  :where(.css-dev-only-do-not-override-m4timi).ant-select-outlined:not(.ant-select-customize-input)\n    .ant-select-selector {\n    border: none;\n  }\n  .roundbox {\n    display: flex;\n    width: 18px;\n    height: 18px;\n    flex-direction: column;\n    justify-content: center;\n    align-items: center;\n    border-radius: 18px;\n    background: #fff;\n    box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.1);\n    left: 359px;\n    position: absolute;\n    border-radius: 18px;\n    background: #fff;\n    box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.1);\n    top: 16px;\n  }\n"])));
+var StyledAntSelect$4 = /*#__PURE__*/styled__default.div(_templateObject2$1v || (_templateObject2$1v = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  .custom-select {\n    border: none;\n    width: 80px;\n  }\n  .ant-select-selector {\n    border: 1px solid #ffffff !important;\n  }\n  :where(.css-dev-only-do-not-override-m4timi).ant-select-single:not(.ant-select-customize-input)\n    .ant-select-selector {\n    padding: 0 5px;\n  }\n  :where(.css-dev-only-do-not-override-m4timi).ant-select-outlined:not(.ant-select-customize-input)\n    .ant-select-selector {\n    border: none;\n  }\n  .roundbox {\n    display: flex;\n    width: 18px;\n    height: 18px;\n    flex-direction: column;\n    justify-content: center;\n    align-items: center;\n    border-radius: 18px;\n    background: #fff;\n    box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.1);\n    left: 359px;\n    position: absolute;\n    border-radius: 18px;\n    background: #fff;\n    box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.1);\n    top: 16px;\n  }\n  .ant-select-clear {\n    top: 40% !important;\n    font-size: 18px !important;\n  }\n"])));
 var PAGE_SIZE_OPTIONS$1 = [50, 100, 150];
 var MAX_PAGES_TO_SHOW$1 = 5;
@@ -10732,25 +10933,20 @@ var ReturnPagination = function ReturnPagination(_ref) {
   }, React__default.createElement(NextIcon, null)))));
 };
-var _templateObject$21, _templateObject2$1w;
+var _templateObject$22, _templateObject2$1w;
 var _excluded$5 = ["count"];
 var ReturnAfterTable = function ReturnAfterTable() {
   var _useReturnAfterOrderD = useReturnAfterOrderData(),
+    returnAfterOrder = _useReturnAfterOrderD[0],
     setReturnOrderData = _useReturnAfterOrderD[1];
   var _useLoading = useLoading(),
     setLoading = _useLoading[1];
   var _useAtom = jotai.useAtom(filtersReducerReturnAtom),
     state = _useAtom[0];
+  var _useCallApiAgain = useCallApiAgain(),
+    callApi = _useCallApiAgain[0];
   var filters = state['x-filters'],
     pagination = state['x-pagination'];
-  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);
   var _UsePaginationReturnD = UsePaginationReturnData(),
     paginationObj = _UsePaginationReturnD[0];
   var _useState = React.useState(1),
@@ -10760,7 +10956,6 @@ var ReturnAfterTable = function ReturnAfterTable() {
     setItemsPerPage = _useItemsPerReturnPag[1];
   var _UsePaginationData = UsePaginationData(),
     setPaginationObject = _UsePaginationData[1];
-  console.log(paths, 'paths');
   var page = paginationObj.page,
     total = paginationObj.total;
   var handlePageChange = function handlePageChange(page) {
@@ -10773,13 +10968,18 @@ var ReturnAfterTable = function ReturnAfterTable() {
       endpoint: '/return_orders/?skip_filters=0',
       method: 'GET',
       filters: filters,
-      pagination: pagination
+      pagination: pagination,
+      performAction: false
     }),
     fetchedReturnOrderData = _useApiHook.data,
-    staticDataLoading = _useApiHook.loading,
+    loading = _useApiHook.loading,
+    setShouldPerformAction = _useApiHook.setShouldPerformAction,
     paginationData = _useApiHook.paginationData;
   React.useEffect(function () {
-    setLoading(staticDataLoading);
+    callApi ? setShouldPerformAction(true) : setShouldPerformAction(false);
+  }, [callApi]);
+  React.useEffect(function () {
+    setLoading(loading);
     if (fetchedReturnOrderData && fetchedReturnOrderData != null && fetchedReturnOrderData.data) {
       setReturnOrderData(fetchedReturnOrderData == null ? void 0 : fetchedReturnOrderData.data);
       if (paginationData !== null) {
@@ -10793,7 +10993,7 @@ var ReturnAfterTable = function ReturnAfterTable() {
         });
       }
     }
-  }, [fetchedReturnOrderData, staticDataLoading]);
+  }, [fetchedReturnOrderData, loading, returnAfterOrder]);
   return React__default.createElement("div", null, React__default.createElement(DashBoardWrapper$2, null, React__default.createElement("div", {
     className: "Tableconatiner"
   }, React__default.createElement(Container$17, null, React__default.createElement(ReturnOrderFilter, null), React__default.createElement(OrderTable, null), total > 0 && React__default.createElement(ReturnPagination, {
@@ -10804,13 +11004,13 @@ var ReturnAfterTable = function ReturnAfterTable() {
     onItemsPerPageChange: handleItemsPerPageChange
   })))));
 };
-var Container$17 = /*#__PURE__*/styled__default.div(_templateObject$21 || (_templateObject$21 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  position: relative;\n  /* top: -30px; */\n"])));
+var Container$17 = /*#__PURE__*/styled__default.div(_templateObject$22 || (_templateObject$22 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  position: relative;\n  /* top: -30px; */\n"])));
 var DashBoardWrapper$2 = /*#__PURE__*/styled__default.section(_templateObject2$1w || (_templateObject2$1w = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  .Tableconatiner {\n    border-radius: 12px;\n    background: #fff;\n    box-shadow: -2px 0px 12px 0px rgba(56, 71, 109, 0.1);\n    display: block;\n    padding: 15px 20px;\n  }\n  .headerWrap,\n  .tableData,\n  .styleCovered {\n    transition: all ease 0.5s;\n  }\n  &.stickyTableHead {\n    h2 {\n      font-size: 21px;\n    }\n    .headerWrap {\n      height: 84px;\n      padding: 10px;\n      border-radius: 0px 0px 15px 15px;\n      > div {\n        position: relative;\n        z-index: 10;\n      }\n    }\n    .styleCovered {\n      margin-top: -32px;\n      width: 67%;\n      float: right;\n      gap: 5px;\n      padding-right: 11px;\n\n      li {\n        padding: 4px 10px 5px 5px;\n        gap: 5px;\n        .svgCover {\n          width: 30px;\n          height: 30px;\n          svg {\n            height: auto;\n            width: 58%;\n          }\n        }\n        .countDigit {\n          font-size: 19px;\n        }\n      }\n      .countMess {\n        font-size: 13px;\n      }\n    }\n    .dmsBulkFilter {\n      min-height: unset;\n      gap: 4px;\n      > div {\n        padding: 4px 12px;\n        label {\n          font-size: 11px;\n        }\n      }\n    }\n\n    .StyledFilterList {\n      gap: 4px;\n      li {\n        height: 29px;\n        padding: 3px 8px;\n        gap: 4px;\n        .StyledFilterBtnIcon {\n          width: 20px;\n          height: 20px;\n          svh {\n            width: 10px;\n            height: auto;\n          }\n        }\n        .StyledFilterBtnLabel {\n          font-size: 13px;\n        }\n      }\n    }\n    .StyledFilterLabel {\n      padding-left: 10px;\n      span {\n        font-size: 13px;\n      }\n    }\n    .cardcontainer.tableData {\n      max-height: calc(100vh - 310px);\n      min-height: calc(100vh - 310px);\n    }\n\n    .tableData {\n      max-height: calc(100vh - 320px);\n      min-height: calc(100vh - 320px);\n\n      margin-top: 8px;\n      thead {\n        position: sticky;\n        top: 0;\n        z-index: 9;\n        th {\n          font-size: 13px;\n          padding: 2px 15px;\n        }\n      }\n    }\n  }\n"])));
 var _templateObject2$1x;
 var StyledBulkItem = /*#__PURE__*/styled__default.div(_templateObject2$1x || (_templateObject2$1x = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  padding: 8px 12px;\n  display: flex;\n  align-items: center;\n  /* border-right: 1px solid #d0d5dd; */\n  gap: 8px;\n  cursor: pointer;\n  position: relative;\n\n  @media screen and (max-width: 1030px) {\n    padding: 8px 11px;\n  }\n\n  ul {\n    margin: 0;\n    padding: 0;\n    list-style: none;\n    box-sizing: border-box;\n    top: 54px;\n  }\n  &:last-child {\n    border-right: none;\n  }\n  &.active svg.arrowDown {\n    transform: rotate(180deg);\n  }\n  label {\n    color: #6a7378;\n    text-align: center;\n    font-family: 'Open Sans';\n    font-size: 14px;\n    font-style: normal;\n    font-weight: 400;\n    line-height: 18px;\n    cursor: pointer;\n  }\n\n  &.noPadding {\n    padding: 0;\n  }\n"])));
-var _templateObject$22, _templateObject2$1y;
+var _templateObject$23, _templateObject2$1y;
 var SearchType = function SearchType() {
   var _useState = React.useState(''),
     searchText = _useState[0],
@@ -10825,7 +11025,7 @@ var SearchType = function SearchType() {
     onChange: handleInputChange
   }));
 };
-var Search = /*#__PURE__*/styled__default.div(_templateObject$22 || (_templateObject$22 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  position: relative;\n  svg {\n    position: absolute;\n    left: 12px;\n    top: 50%;\n    transform: translateY(-50%);\n  }\n"])));
+var Search = /*#__PURE__*/styled__default.div(_templateObject$23 || (_templateObject$23 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  position: relative;\n  svg {\n    position: absolute;\n    left: 12px;\n    top: 50%;\n    transform: translateY(-50%);\n  }\n"])));
 var SearchInput = /*#__PURE__*/styled__default.input(_templateObject2$1y || (_templateObject2$1y = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  border-radius: 20px;\n  border: 1px solid #e0e2e7;\n  background: #fff;\n  box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);\n  display: flex;\n  padding: 8.5px 12px;\n  align-items: center;\n  gap: 8px;\n  align-self: stretch;\n  padding-left: 39px;\n"])));
 var BulkFilter = function BulkFilter() {
@@ -10900,14 +11100,14 @@ var Filters = function Filters() {
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(StyledFiter, null, React__default.createElement(StyledFIlterELements, null, React__default.createElement(StyledTableFilter, null)), React__default.createElement(BulkFilter, null)));
 };
-var ReturnTable$1 = function ReturnTable(_ref) {
-  var loadingskeleton = _ref.loadingskeleton;
+var ReturnTable$1 = function ReturnTable() {
   var _useClientData = useClientData(),
     clientData = _useClientData[0];
   var _useState = React.useState([]),
     updatedData = _useState[0],
     setUpdatedData = _useState[1];
   var _useLoading = useLoading(),
+    statsLoading = _useLoading[0],
     setLoading = _useLoading[1];
   var _useOrderStaticData = useOrderStaticData(),
     setOrderStaticData = _useOrderStaticData[1];
@@ -10933,19 +11133,19 @@ var ReturnTable$1 = function ReturnTable(_ref) {
   React.useEffect(function () {
     var updatedClientData = clientData == null ? void 0 : clientData.map(function (client) {
       var matchingCustomer = customers == null ? void 0 : customers.find(function (customer) {
-        return (customer == null ? void 0 : customer.id) === (client == null ? void 0 : client.customer_id);
+        return (customer == null ? void 0 : customer.customer_id) === (client == null ? void 0 : client.customer_id);
       });
       return _extends({}, client, {
-        uuid: matchingCustomer ? matchingCustomer == null ? void 0 : matchingCustomer.uuid : null
+        account_number: matchingCustomer ? matchingCustomer == null ? void 0 : matchingCustomer.account_number : null
       });
     });
     setUpdatedData(updatedClientData);
   }, [customers, clientData]);
   //handle Redirect
-  var handleRedirect = function handleRedirect(customerName, customerId, customerUuid) {
+  var handleRedirect = function handleRedirect(customerName, customerId, account_number) {
     localStorage.setItem('clientName', customerName);
     localStorage.setItem('clientId', customerId == null ? void 0 : customerId.toString());
-    localStorage.setItem('uuid', customerUuid);
+    localStorage.setItem('account_number', account_number);
     if (customerId) {
       dispatch({
         type: 'SET_CLIENT_FILTER',
@@ -10961,12 +11161,13 @@ var ReturnTable$1 = function ReturnTable(_ref) {
         payload: []
       });
     }
-    var selectedClientString = customerName == null ? void 0 : customerName.replace(/\s+/g, '-');
-    navigate("filter/" + selectedClientString);
+    navigate("filter/" + customerId);
+    //forlocal
+    // navigate(`/filter/${customerId}`);
   };
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(StyledTableWrapper$2, {
     id: "tableScrolling"
-  }, React__default.createElement(StyledTable$3, null, React__default.createElement("thead", null, React__default.createElement("tr", null, React__default.createElement("th", null, "Trading Name"), React__default.createElement("th", null, "Client"), React__default.createElement("th", null, "Orders"), React__default.createElement("th", null, "Products"), React__default.createElement("th", null, "RTS"), React__default.createElement("th", null, "Pending"), React__default.createElement("th", null, "Dispose"), React__default.createElement("th", null, "Re-allocate"), React__default.createElement("th", null, "Re-Del"), React__default.createElement("th", null, "Recycle"), React__default.createElement("th", null, "Unknown"))), React__default.createElement("tbody", null, loadingskeleton ? React__default.createElement("tr", null, React__default.createElement("td", {
+  }, React__default.createElement(StyledTable$3, null, React__default.createElement("thead", null, React__default.createElement("tr", null, React__default.createElement("th", null, "Trading Name"), React__default.createElement("th", null, "Client"), React__default.createElement("th", null, "Orders"), React__default.createElement("th", null, "Products"), React__default.createElement("th", null, "RTS"), React__default.createElement("th", null, "Pending"), React__default.createElement("th", null, "Dispose"), React__default.createElement("th", null, "Re-allocate"), React__default.createElement("th", null, "Re-Del"), React__default.createElement("th", null, "Recycle"), React__default.createElement("th", null, "Unknown"))), React__default.createElement("tbody", null, statsLoading ? React__default.createElement("tr", null, React__default.createElement("td", {
     colSpan: 11
   }, React__default.createElement(antd.Skeleton, {
     active: true
@@ -10977,35 +11178,88 @@ var ReturnTable$1 = function ReturnTable(_ref) {
       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.uuid);
+        return handleRedirect(key == null ? void 0 : key.customer_name, key == null ? void 0 : key.customer_id, key == null ? void 0 : key.account_number);
       },
       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.return_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", 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))));
   })))));
 };
-var _templateObject$23, _templateObject2$1z, _templateObject3$T;
+// let todayDate = new Date();
+var initialState$3 = {
+  'x-filters': [
+    // {
+    //   field: 'action_date',
+    //   op: '>=',
+    //   value: `${format(new Date(todayDate), 'yyyy-MM-dd')}T00:00:00+00:00`,
+    // },
+    // {
+    //   field: 'action_date',
+    //   op: '<=',
+    //   value: `${format(new Date(todayDate), 'yyyy-MM-dd')}T23:59:59+00:00`,
+    // },
+    // { field: 'status', op: 'count', value: '' },
+  ],
+  'x-pagination': {
+    page: 1,
+    per_page: 50
+  }
+};
+var filterReducer$2 = function filterReducer(state, action) {
+  switch (action.type) {
+    case 'SET_PAGE':
+      return _extends({}, state, {
+        'x-pagination': _extends({}, state['x-pagination'], {
+          page: action.payload
+        })
+      });
+    case 'SET_PERPAGE':
+      return _extends({}, state, {
+        'x-pagination': _extends({}, state['x-pagination'], {
+          per_page: action.payload
+        })
+      });
+    case 'CLEAR_FILTERS':
+      return _extends({}, state);
+    case 'CLEAR_ALL_FILTER':
+      return _extends({}, state);
+    default:
+      return state;
+  }
+};
+var filtersStateAtom$2 = /*#__PURE__*/jotai.atom(initialState$3);
+var overviewfiltersReducerAtom = /*#__PURE__*/jotai.atom(function (get) {
+  return get(filtersStateAtom$2);
+}, function (get, set, action) {
+  return set(filtersStateAtom$2, filterReducer$2(get(filtersStateAtom$2), action));
+});
+var _templateObject$24, _templateObject2$1z, _templateObject3$T;
+// import { notification } from 'antd';
+// import Pagination from './table-view/Pagination';
 // import Pagination from './table-view/Pagination';
 // import { overviewfiltersReducerAtom } from './header-filters/overViewFilter';
 function ReturnMainTable() {
-  // const [state] = useAtom(overviewfiltersReducerAtom);
-  // const [paginationObj] = UsePaginationData();
+  var _useAtom = jotai.useAtom(overviewfiltersReducerAtom),
+    state = _useAtom[0];
+  // const [paginationObj] = UsePaginationOverviewData();
   // const [, setCurrentPage] = useState(1);
-  // const [itemsPerPage, setItemsPerPage] = useItemsPerPage();
-  // const { 'x-pagination': pagination } = state;
+  // const [itemsPerPage, setItemsPerPage] = useItemsPerOverviewPage();
+  var pagination = state['x-pagination'];
   // const { page, total } = paginationObj;
   // const [selectedClient] = useTableName();
-  // const [, setPaginationObject] = UsePaginationData();
   var _useStickyStatus = useStickyStatus(),
     isScrolled = _useStickyStatus[0];
   var _useLoading = useLoading(),
     setLoading = _useLoading[1];
   var _useClientData = useClientData(),
     setClientData = _useClientData[1];
+  var _useTableName = useTableName(),
+    tableName = _useTableName[0];
   // const handlePageChange = (page: number) => {
   //   setCurrentPage(page);
   // };
@@ -11013,19 +11267,15 @@ function ReturnMainTable() {
   //   setItemsPerPage(itemsPerPage);
   // };
   var _useApiHook = dmsComponentLibrary.useApiHook({
-      endpoint: "/return_orders/get/client-returns/",
+      endpoint: "/return_orders/stats/",
       method: 'GET',
       //@ts-ignore
-      pagination: {
-        page: 1,
-        per_page: 200,
-        is_pagination: false
-      }
+      pagination: pagination
     }),
     fetchedClientData = _useApiHook.data,
-    staticDataLoading = _useApiHook.loading;
+    statsDataLoading = _useApiHook.loading;
   React.useEffect(function () {
-    setLoading(staticDataLoading);
+    setLoading(statsDataLoading);
     if (fetchedClientData && fetchedClientData.data) {
       var result = fetchedClientData == null ? void 0 : fetchedClientData.data;
       setClientData(result);
@@ -11039,33 +11289,32 @@ function ReturnMainTable() {
       //   });
       // }
     }
-  }, [staticDataLoading]);
-  var getClient = localStorage.getItem('clientName');
+  }, [statsDataLoading]);
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(DashBoardWrapper$3, {
     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"), getClient ? React__default.createElement(ReturnFilter, null) : React__default.createElement(Filters, null)), React__default.createElement(ReturnTable$1, null)))));
+  }, 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)))));
 }
-var Row$7 = /*#__PURE__*/styled__default.div(_templateObject$23 || (_templateObject$23 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n"])));
+var Row$7 = /*#__PURE__*/styled__default.div(_templateObject$24 || (_templateObject$24 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n"])));
 var Container$18 = /*#__PURE__*/styled__default.div(_templateObject2$1z || (_templateObject2$1z = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  position: relative;\n  top: -46px;\n"])));
 var DashBoardWrapper$3 = /*#__PURE__*/styled__default.section(_templateObject3$T || (_templateObject3$T = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  .Tableconatiner {\n    border-radius: 12px;\n    background: #fff;\n    box-shadow: -2px 0px 12px 0px rgba(56, 71, 109, 0.1);\n    display: block;\n    padding: 15px 20px;\n  }\n  .headerWrap,\n  .tableData,\n  .styleCovered {\n    transition: all ease 0.5s;\n  }\n  &.stickyTableHead {\n    h2 {\n      font-size: 21px;\n    }\n    .headerWrap {\n      height: 84px;\n      padding: 10px;\n      border-radius: 0px 0px 15px 15px;\n      > div {\n        position: relative;\n        z-index: 10;\n      }\n    }\n    .styleCovered {\n      margin-top: -32px;\n      width: 67%;\n      float: right;\n      gap: 5px;\n      padding-right: 11px;\n\n      li {\n        padding: 4px 10px 5px 5px;\n        gap: 5px;\n        .svgCover {\n          width: 30px;\n          height: 30px;\n          svg {\n            height: auto;\n            width: 58%;\n          }\n        }\n        .countDigit {\n          font-size: 19px;\n        }\n      }\n      .countMess {\n        font-size: 13px;\n      }\n    }\n    .dmsBulkFilter {\n      min-height: unset;\n      gap: 4px;\n      > div {\n        padding: 4px 12px;\n        label {\n          font-size: 11px;\n        }\n      }\n    }\n\n    .StyledFilterList {\n      gap: 4px;\n      li {\n        height: 29px;\n        padding: 3px 8px;\n        gap: 4px;\n        .StyledFilterBtnIcon {\n          width: 20px;\n          height: 20px;\n          svh {\n            width: 10px;\n            height: auto;\n          }\n        }\n        .StyledFilterBtnLabel {\n          font-size: 13px;\n        }\n      }\n    }\n    .StyledFilterLabel {\n      padding-left: 10px;\n      span {\n        font-size: 13px;\n      }\n    }\n    .cardcontainer.tableData {\n      max-height: calc(100vh - 310px);\n      min-height: calc(100vh - 310px);\n    }\n\n    .tableData {\n      max-height: calc(100vh - 320px);\n      min-height: calc(100vh - 320px);\n\n      margin-top: 8px;\n      thead {\n        position: sticky;\n        top: 0;\n        z-index: 9;\n        th {\n          font-size: 13px;\n          padding: 2px 15px;\n        }\n      }\n    }\n  }\n"])));
-var _templateObject$24, _templateObject2$1A;
-var HeaderWrapper = /*#__PURE__*/styled__default.div(_templateObject$24 || (_templateObject$24 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  padding: 20px;\n  gap: 10px;\n  border-radius: 0px 0px 30px 30px;\n  background: #313130;\n  height: 151px;\n  background: url(./assets/bgBlack.png) no-repeat;\n    background-size: cover;\n    background-color: #000000d9;\n"])));
+var _templateObject$25, _templateObject2$1A;
+var HeaderWrapper = /*#__PURE__*/styled__default.div(_templateObject$25 || (_templateObject$25 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  padding: 20px;\n  gap: 10px;\n  border-radius: 0px 0px 30px 30px;\n  background: #313130;\n  height: 151px;\n  background: url(./assets/bgBlack.png) no-repeat;\n    background-size: cover;\n    background-color: #000000d9;\n"])));
 var StyledFlex = /*#__PURE__*/styled__default.div(_templateObject2$1A || (_templateObject2$1A = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: space-between;\n  width: 100%;\n"])));
-var _templateObject$25;
+var _templateObject$26;
 var HeaderTitle = function HeaderTitle(props) {
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(Title$7, null, props.title));
 };
-var Title$7 = /*#__PURE__*/styled__default.h2(_templateObject$25 || (_templateObject$25 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  margin: 0px;\n  padding: 0px;\n  color: #fff;\n  font-size: 26px;\n  font-style: normal;\n  font-weight: 700;\n  line-height: 36px;\n  text-transform: uppercase;\n  margin-bottom: 8px;\n"])));
+var Title$7 = /*#__PURE__*/styled__default.h2(_templateObject$26 || (_templateObject$26 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  margin: 0px;\n  padding: 0px;\n  color: #fff;\n  font-size: 26px;\n  font-style: normal;\n  font-weight: 700;\n  line-height: 36px;\n  text-transform: uppercase;\n  margin-bottom: 8px;\n"])));
-var _templateObject$26, _templateObject2$1B;
+var _templateObject$27, _templateObject2$1B;
 function Breadcrumb(props) {
   return React__default.createElement(BreadcrumbContainer, null, React__default.createElement(BreadcrumbList, null, props.title || ''), React__default.createElement(BreadcrumbList, null, props.subtitle || ''), props.subPart && React__default.createElement(React__default.Fragment, null, React__default.createElement(BreadcrumbList, null, props.subPart)));
 }
-var BreadcrumbContainer = /*#__PURE__*/styled__default.div(_templateObject$26 || (_templateObject$26 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n"])));
+var BreadcrumbContainer = /*#__PURE__*/styled__default.div(_templateObject$27 || (_templateObject$27 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n"])));
 var BreadcrumbList = /*#__PURE__*/styled__default.span(_templateObject2$1B || (_templateObject2$1B = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: #edebe8;\n  font-family: 'Open Sans', sans-serif;\n  font-size: 13px;\n  font-style: normal;\n  font-weight: 400;\n  line-height: 16px;\n"])));
 var RouterHeader = function RouterHeader(_ref) {
@@ -11088,20 +11337,16 @@ var RouterHeader = function RouterHeader(_ref) {
   })))));
 };
-// import { filtersReducerAtom } from './components/order-daily-overview/header-filters/filterStore';
 function ReturnClient() {
-  var _selectedClientString;
   antd.notification.config({
     top: 80
   });
   var LoadingMessage = function LoadingMessage() {
     return React__default.createElement("div", null, "Loading...");
   };
-  var _useTableName = useTableName(),
-    selectedClient = _useTableName[0];
+  var _useIdForTableName = useIdForTableName(),
+    selectedClientId = _useIdForTableName[0];
   var navigate = reactRouterDom.useNavigate();
-  var selectedClientString = selectedClient == null ? void 0 : selectedClient.replace(/\s+/g, '-');
-  selectedClientString = (_selectedClientString = selectedClientString) == null ? void 0 : _selectedClientString.toLowerCase();
   var _useCustomerData = useCustomerData(),
     setCustomers = _useCustomerData[1];
   var _useActionType = useActionType(),
@@ -11110,7 +11355,14 @@ function ReturnClient() {
     setLocationData = _useLocationData[1];
   var _useStatusOrderData = useStatusOrderData(),
     setStatusOfOrders = _useStatusOrderData[1];
-  // const [dispatchvalue] = useAtom(filtersReducerAtom);
+  var _useAssignData = useAssignData(),
+    setAssignData = _useAssignData[1];
+  var _useActionTypeOptions = useActionTypeOptions(),
+    setActionTypeOptions = _useActionTypeOptions[1];
+  var _useLocationOptions = useLocationOptions(),
+    setLocationOptions = _useLocationOptions[1];
+  var _useTableName = useTableName(),
+    setTableName = _useTableName[1];
   var splitPath = function splitPath(str) {
     var _str$split;
     var parts = str == null || (_str$split = str.split('/')) == null ? void 0 : _str$split.filter(function (part) {
@@ -11123,23 +11375,25 @@ function ReturnClient() {
     if (paths[paths.length - 1] === 'returnclient') {
       localStorage.removeItem('clientName');
       localStorage.removeItem('clientId');
-      localStorage.removeItem('uuid');
-      // dispatch({ type: 'CLEAR_CLIENT' });
+      localStorage.removeItem('account_number');
+      setActionTypeOptions([]);
+      setLocationOptions([]);
+      setTableName('');
     }
   }, [location.pathname]);
   React.useEffect(function () {
-    if (selectedClient) {
-      var _selectedClientString2 = selectedClient.replace(/\s+/g, '-');
-      navigate("filter/" + _selectedClientString2);
+    if (selectedClientId) {
+      navigate("filter/" + selectedClientId);
     }
-  }, [selectedClient]);
+  }, [selectedClientId]);
   //API for client data
   var _useApiHook = dmsComponentLibrary.useApiHook({
-      endpoint: "/customers/",
+      endpoint: "/return_orders/customers/",
       method: 'GET',
       //@ts-ignore
       pagination: {
-        is_pagination: false
+        page: 1,
+        per_page: 50
       }
     }),
     fetchedCustomerData = _useApiHook.data,
@@ -11169,13 +11423,16 @@ function ReturnClient() {
   }, [loading]);
   React.useEffect(function () {
     if (fetchedStaticData && fetchedStaticData != null && fetchedStaticData.data) {
-      var _fetchedStaticData$da, _fetchedStaticData$da2;
+      var _fetchedStaticData$da, _fetchedStaticData$da2, _fetchedStaticData$da3;
       setActionType(fetchedStaticData == null || (_fetchedStaticData$da = fetchedStaticData.data) == null ? void 0 : _fetchedStaticData$da.flatMap(function (i) {
         return i == null ? void 0 : i.order_product_return_action;
       }));
       setStatusOfOrders(fetchedStaticData == null || (_fetchedStaticData$da2 = fetchedStaticData.data) == null ? void 0 : _fetchedStaticData$da2.flatMap(function (i) {
         return i == null ? void 0 : i.order_stock_alias;
       }));
+      setAssignData(fetchedStaticData == null || (_fetchedStaticData$da3 = fetchedStaticData.data) == null ? void 0 : _fetchedStaticData$da3.flatMap(function (i) {
+        return i == null ? void 0 : i.assign_client;
+      }));
     }
   }, [actionLoading]);
   React.useEffect(function () {
@@ -11195,7 +11452,7 @@ function ReturnClient() {
     path: "order-return/:id",
     element: React__default.createElement(OrderView, null)
   }), React__default.createElement(reactRouterDom.Route, {
-    path: "filter/:clientName",
+    path: "filter/:clientId",
     element: React__default.createElement(ReturnTable, null)
   }))));
 }