@bjsdistribution/dms-client-return 0.0.10 → 0.0.12

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

@@ -1,10 +1,10 @@
 import React, { useEffect, useState, useMemo, useRef, Suspense } from 'react';
 import { useLocation, useParams, NavLink, useNavigate, Routes, Route } from 'react-router-dom';
 import styled, { css, keyframes } from 'styled-components';
-import { Label as Label$h, Input as Input$1, TextArea, FormSection, displayValueOrNA, SelectDropdown, dropdownStyles, RadioButtonGroup as RadioButtonGroup$1, Switch, Button as Button$1, useApiHook, getBaseEndpoint, formatDateTime, Alert, Checkbox as Checkbox$1, SectionHeader, CrossIcon, AntSelect, AntTable, CustomRating, DeleteIcon, CancelationModal, CancelAndCompleteAction, filterDropdownStyles, BackgroundModal as BackgroundModal$1, AntModal } from '@bjsdistribution/dms-component-library';
+import { Label as Label$h, Input as Input$1, TextArea, FormSection, displayValueOrNA as displayValueOrNA$1, SelectDropdown, dropdownStyles, RadioButtonGroup as RadioButtonGroup$1, Switch, Button as Button$1, useApiHook, getBaseEndpoint, formatDateTime, Alert, Checkbox as Checkbox$1, SectionHeader, CrossIcon, AntSelect, AntTable, CustomRating, DeleteIcon, CancelationModal, CancelAndCompleteAction, filterDropdownStyles, BackgroundModal as BackgroundModal$1, AntModal } from '@bjsdistribution/dms-component-library';
 import { useAtom, atom } from 'jotai';
 import { atomWithReducer } from 'jotai/utils';
-import { DatePicker, notification, Skeleton, Upload, message, Input as Input$2, Select, Empty, Checkbox as Checkbox$2, Tabs, Tooltip } from 'antd';
+import { DatePicker, notification, Skeleton, Upload, message, Input as Input$2, Select, Empty, Checkbox as Checkbox$2, Tabs } from 'antd';
 import dayjs from 'dayjs';
 import { useReactTable, getCoreRowModel, getSortedRowModel, flexRender } from '@tanstack/react-table';
 import Scrollbars from 'react-custom-scrollbars-2';
@@ -1351,8 +1351,8 @@ function ConsignmentNumber() {
   return React.createElement(Container$d, null, React.createElement(Wrapper$8, null, React.createElement(Label$h, {
     label: "Consignment Number"
   }), React.createElement(CopyText, {
-    text: displayValueOrNA(orderDetails.consignment)
-  })), React.createElement(Consignment, null, displayValueOrNA(orderDetails.consignment)));
+    text: displayValueOrNA$1(orderDetails.consignment)
+  })), React.createElement(Consignment, null, displayValueOrNA$1(orderDetails.consignment)));
 }
 var Wrapper$8 = /*#__PURE__*/styled.div(_templateObject$g || (_templateObject$g = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  gap: 5px;\n"])));
 var Consignment = /*#__PURE__*/styled.span(_templateObject2$e || (_templateObject2$e = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: #249e45;\n  font-family: 'Lato', sans-serif;\n  font-size: 13px;\n  font-style: normal;\n  font-weight: 400;\n"])));
@@ -3143,7 +3143,7 @@ function GeneralHeader() {
 var Section = /*#__PURE__*/styled.div(_templateObject$V || (_templateObject$V = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  /* display: flex;\n  background: #ffffff;\n  // padding: 15px;\n  flex-direction: column;\n  gap: 14px;\n  border-radius: 12px;\n  box-shadow: 0px 4px 30px 0px rgba(46, 45, 116, 0.05);\n  border: 1px solid #e0e0e0; */\n"])));
 
 var _templateObject19, _templateObject20, _templateObject21;
-var StyledTable = /*#__PURE__*/styled.table(_templateObject19 || (_templateObject19 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  border-spacing: 0 10px;\n  width: 100%;\n  /* min-width: 1600px; */\n  thead {\n    white-space: nowrap;\n    tr {\n      border-radius: 40px;\n      border-spacing: 0 10px;\n      .emailInvoiceCheckbox {\n        padding-right: 0px;\n        width: 0;\n        > div {\n          width: fit-content;\n        }\n      }\n      .emailInvoiceNo {\n        padding-left: 0px;\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        .actionbox {\n          display: flex;\n          gap: 5px;\n        }\n        .shareIconContainer {\n          display: flex;\n          padding: 2px 12px;\n          align-items: center;\n          gap: 8px;\n          border-radius: 20px;\n          border: 1px solid var(--tonal-brown-101, #e2e0db);\n          background: #fff;\n          list-style-type: none;\n          /* padding-left: 0; */\n          /* fontWeight: 600,\n          paddingLeft: 0, */\n          cursor: pointer;\n          position: relative;\n        }\n        .statusCancelled {\n          color: #e95252;\n          /* background: rgba(233, 82, 82, 0.15); */\n          padding: 4px 8px;\n          border-radius: 4px;\n        }\n\n        .statusOnHold {\n          color: #f4a503;\n          /* background: #fff1d6; */\n          padding: 4px 8px;\n          border-radius: 4px;\n        }\n\n        .statusSubContracted {\n          color: #845adf;\n          /* background: rgba(132, 90, 223, 0.15); */\n          padding: 4px 8px;\n          border-radius: 4px;\n        }\n\n        .statusAwaiting {\n          color: #845adf;\n          /* background: rgba(132, 90, 223, 0.15); */\n          padding: 4px 8px;\n          border-radius: 4px;\n        }\n\n        .statusCompleted {\n          color: #1f9254;\n          /* background: rgba(41, 204, 106, 0.15); */\n          padding: 4px 8px;\n          border-radius: 4px;\n        }\n\n        .statusOutstanding {\n          color: #f4a503;\n          /* background: #fff1d6; */\n          padding: 4px 8px;\n          border-radius: 4px;\n        }\n\n        .statusUnknown {\n          color: #000;\n          /* background: #fff; */\n          padding: 4px 8px;\n          border-radius: 4px;\n        }\n        .statustext {\n          color: #1f9254;\n          font-family: 'Open Sans';\n          font-size: 12px;\n          font-style: normal;\n          font-weight: 600;\n          line-height: normal;\n        }\n        .downloadcontainer {\n          display: flex;\n          padding: 2px 12px;\n          align-items: center;\n\n          width: 28px;\n          height: 28px;\n          flex-direction: column;\n\n          border-radius: 14px;\n          border: 1px solid #e2e0db;\n          background: #fff;\n        }\n        .statuscontainer {\n          display: flex;\n          padding: 5px 30px 5px 30px;\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        ul > li > a {\n          text-decoration: none !important;\n          color: #0099ff;\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 StyledTable = /*#__PURE__*/styled.table(_templateObject19 || (_templateObject19 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  border-spacing: 0 10px;\n  width: 100%;\n  /* min-width: 1600px; */\n  thead {\n    white-space: nowrap;\n    tr {\n      border-radius: 40px;\n      border-spacing: 0 10px;\n      .emailInvoiceCheckbox {\n        padding-right: 0px;\n        width: 0;\n        > div {\n          width: fit-content;\n        }\n      }\n      .custom-check {\n        position: relative;\n      }\n      .emailInvoiceNo {\n        padding-left: 0px;\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        .actionbox {\n          display: flex;\n          gap: 5px;\n        }\n        .shareIconContainer {\n          display: flex;\n          padding: 2px 12px;\n          align-items: center;\n          gap: 8px;\n          border-radius: 20px;\n          border: 1px solid var(--tonal-brown-101, #e2e0db);\n          background: #fff;\n          list-style-type: none;\n          /* padding-left: 0; */\n          /* fontWeight: 600,\n          paddingLeft: 0, */\n          cursor: pointer;\n          position: relative;\n        }\n        .statusCancelled {\n          color: #e95252;\n          /* background: rgba(233, 82, 82, 0.15); */\n          padding: 4px 8px;\n          border-radius: 4px;\n        }\n\n        .statusOnHold {\n          color: #f4a503;\n          /* background: #fff1d6; */\n          padding: 4px 8px;\n          border-radius: 4px;\n        }\n\n        .statusSubContracted {\n          color: #845adf;\n          /* background: rgba(132, 90, 223, 0.15); */\n          padding: 4px 8px;\n          border-radius: 4px;\n        }\n\n        .statusAwaiting {\n          color: #845adf;\n          /* background: rgba(132, 90, 223, 0.15); */\n          padding: 4px 8px;\n          border-radius: 4px;\n        }\n\n        .statusCompleted {\n          color: #1f9254;\n          /* background: rgba(41, 204, 106, 0.15); */\n          padding: 4px 8px;\n          border-radius: 4px;\n        }\n\n        .statusOutstanding {\n          color: #f4a503;\n          /* background: #fff1d6; */\n          padding: 4px 8px;\n          border-radius: 4px;\n        }\n\n        .statusUnknown {\n          color: #000;\n          /* background: #fff; */\n          padding: 4px 8px;\n          border-radius: 4px;\n        }\n        .statustext {\n          color: #1f9254;\n          font-family: 'Open Sans';\n          font-size: 12px;\n          font-style: normal;\n          font-weight: 600;\n          line-height: normal;\n        }\n        .downloadcontainer {\n          display: flex;\n          padding: 2px 12px;\n          align-items: center;\n\n          width: 28px;\n          height: 28px;\n          flex-direction: column;\n\n          border-radius: 14px;\n          border: 1px solid #e2e0db;\n          background: #fff;\n        }\n        .statuscontainer {\n          display: flex;\n          padding: 5px 30px 5px 30px;\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        .awaiting {\n          display: flex;\n          min-width: 85px;\n          padding: 6px 10px;\n          justify-content: center;\n          align-items: center;\n          gap: 5px;\n          border-radius: 22px;\n          background: rgba(233, 82, 82, 0.15);\n          color: #e95252;\n          font-family: 'Open Sans';\n          font-size: 12px;\n          font-weight: 600;\n        }\n        ul > li > a {\n          text-decoration: none !important;\n          color: #0099ff;\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"])));
 // Styled components
 var StyledTableWrapper = /*#__PURE__*/styled.div(_templateObject20 || (_templateObject20 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  overflow-x: auto;\n  max-height: calc(100vh - 396px);\n  scrollbar-width: none;\n  height: 600px;\n  /* box-shadow: 0px 0px 30px 6px rgba(46, 45, 116, 0.05); */\n  &::-webkit-scrollbar {\n    width: 5px;\n    border-radius: 100px;\n    height: 5px;\n  }\n\n  &::-webkit-scrollbar-track {\n    background: #777;\n    border-radius: 100px;\n  }\n\n  &::-webkit-scrollbar-thumb {\n    background: #7b61ff;\n    border-radius: 100px;\n  }\n\n  &::-webkit-scrollbar-thumb:hover {\n    background: #7b61ff;\n  }\n"])));
 var CustomDrop = /*#__PURE__*/styled.div(_templateObject21 || (_templateObject21 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  /* border-radius: 20px;\n  border: 1px solid #e2e0db;\n  background: #fff;\n  display: flex;\n  padding: 4px 8px;\n  gap: 8px;\n  align-items: center; */\n  cursor: pointer;\n  &.active .drop {\n    transform: rotate(180deg);\n  }\n"])));
@@ -3178,6 +3178,11 @@ var locationData = /*#__PURE__*/atom([]);
 var createReturnPayload = /*#__PURE__*/atom(CreateReturnInitial);
 var newPayload = /*#__PURE__*/atom([]);
 var grpPayload = /*#__PURE__*/atom([]);
+var statusOfOrder = /*#__PURE__*/atom([]);
+var selectedLocationConfirm = /*#__PURE__*/atom([]);
+var selectAll = /*#__PURE__*/atom(false);
+var postLoading = /*#__PURE__*/atom(false);
+var _final = /*#__PURE__*/atom([]);
 var selectedOrderlList = /*#__PURE__*/atom([]);
 function useSelectedOrders() {
   return useAtom(selectedOrderlList);
@@ -3205,6 +3210,21 @@ function useNewReturnPayload() {
 function useGroupedPayload() {
   return useAtom(grpPayload);
 }
+function useStatusOrderData() {
+  return useAtom(statusOfOrder);
+}
+function useSelectedConfirmLoc() {
+  return useAtom(selectedLocationConfirm);
+}
+function useSelectAll() {
+  return useAtom(selectAll);
+}
+function usePostLoading() {
+  return useAtom(postLoading);
+}
+function useFinalPayload() {
+  return useAtom(_final);
+}
 
 var ReturnProductTable = function ReturnProductTable() {
   var _useSelectedOrders = useSelectedOrders(),
@@ -8335,6 +8355,12 @@ function SelectionFilter() {
     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];
   //client options
   var clientOptions = customers == null ? void 0 : customers.map(function (option) {
     var _option$customer_name, _option$customer_name2;
@@ -8357,7 +8383,7 @@ function SelectionFilter() {
   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.customer_id
+      value: option == null ? void 0 : option.token
     };
   });
   //client change
@@ -8383,7 +8409,6 @@ function SelectionFilter() {
         customer_id: storedCustomerId
       });
     });
-    console.log(selectedUuids, 'selectedUuids');
     var filteredSubLocations = locationData == null ? void 0 : locationData.filter(function (subCat) {
       return (subCat == null ? void 0 : subCat.customer_id) === selectedUuids;
     }).map(function (subCat) {
@@ -8394,6 +8419,10 @@ function SelectionFilter() {
     });
     setFilteredLocationOptions(filteredSubLocations);
     setUuid('');
+    setSelectedReturnOrder([]);
+    setNewPayload([]);
+    setGrouped([]);
+    setSelectAll(false);
   };
   useEffect(function () {
     var accountNumberFromStorage = localStorage.getItem('account_number');
@@ -8417,8 +8446,7 @@ function SelectionFilter() {
   //location change
   var handleLocationChange = function handleLocationChange(value, option) {
     var selectedLabel = option == null ? void 0 : option.label;
-    console.log(value, 'value');
-    setSelectedLocationValue(selectedLabel);
+    setSelectedLocationValue(value);
     if (selectedLocationValue === selectedLabel) {
       dispatch({
         type: 'CLEAR_ALL_FILTERS',
@@ -8477,8 +8505,8 @@ function SelectionFilter() {
       setIsButtonEnabled(false);
     }
   }, [storedName, selectedFilterValue, selectedLocationValue]);
-  console.log(filteredLocationOptions, 'filteredLocationOptions');
-  console.log('check', storedName, selectedFilterValue, selectedLocationValue);
+  // console.log(filteredLocationOptions, 'filteredLocationOptions');
+  // console.log('check', storedName, selectedFilterValue, selectedLocationValue);
   return React.createElement(Wrapper$k, null, React.createElement(FilterRow, null, React.createElement(LeftColumn, null, React.createElement(FilterColumn, null, React.createElement(Label$g, null, "Clients"), React.createElement(StyledAntSelect$5, {
     options: clientOptions,
     placeholder: "Select Client Name",
@@ -8520,6 +8548,8 @@ function HeaderFilter() {
     setActionType = _useActionType[1];
   var _useLocationData = useLocationData(),
     setLocationData = _useLocationData[1];
+  var _useStatusOrderData = useStatusOrderData(),
+    setStatusOfOrders = _useStatusOrderData[1];
   //API for client data
   var _useApiHook = useApiHook({
       endpoint: "/customers/",
@@ -8560,10 +8590,13 @@ function HeaderFilter() {
   }, [loading, fetchedCustomerData]);
   useEffect(function () {
     if (fetchedStaticData && fetchedStaticData != null && fetchedStaticData.data) {
-      var _fetchedStaticData$da;
+      var _fetchedStaticData$da, _fetchedStaticData$da2;
       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;
+      }));
     }
   }, [actionLoading, fetchedStaticData]);
   useEffect(function () {
@@ -8808,30 +8841,28 @@ var formatDate$1 = function formatDate(date) {
   // const seconds = padZero(date.getSeconds());
   return year + "-" + month + "-" + day;
 };
+var displayValueOrNA = function displayValueOrNA(value) {
+  var isBlankArray = Array.isArray(value) && value.length === 0;
+  if (value === 0) {
+    return 0;
+  }
+  if (value === 'NA' || value === undefined || value === null || isBlankArray) {
+    return 'NA';
+  }
+  return value;
+};
 
-var optionsPrint = [{
-  icon: 'runSheet',
-  label: 'Print Runsheet'
-}, {
-  icon: 'loadSheet',
-  label: 'Print Loadsheet'
-}, {
+var optionsForReturnPrint = [{
   icon: 'deliveryLables',
-  label: 'Print Delivery Labels'
-}, {
-  icon: 'customerLables',
-  label: 'Print Customer Labels'
-}, {
-  icon: 'collectionLables',
-  label: 'Print Collection Labels'
+  label: 'Print Return Labels'
 }];
 
 var _templateObject$23, _templateObject2$1t;
 // import { PrintIconMap } from '../utils';
 // import { optionsPrint } from '../fakeData';
 // import { PrintData } from '../interface';
-var options$2 = optionsPrint;
-var PrintDropDown = function PrintDropDown() {
+var options$2 = optionsForReturnPrint;
+var PrintDropDownReturn = function PrintDropDownReturn() {
   var downloadFiles = function downloadFiles() {};
   return React.createElement(OptionsList, null, options$2.map(function (item, index) {
     var IconComponent = PrintIconMap[item.icon];
@@ -8844,22 +8875,22 @@ var PrintDropDown = function PrintDropDown() {
 var OptionsList = /*#__PURE__*/styled.ul(_templateObject$23 || (_templateObject$23 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  margin: 0;\n  padding: 0;\n  list-style: none;\n  box-sizing: border-box;\n  border-radius: 6px;\n  border: 1px solid rgba(224, 226, 231, 0.5);\n  background: #fff;\n  box-shadow: 0px 4px 30px 0px rgba(46, 45, 116, 0.05);\n  width: 177px;\n  padding: 5px 1px 3px 1px;\n  position: absolute;\n  top: 26px;\n  right: 0;\n  z-index: 99;\n  min-width: 194px;\n"])));
 var OptionsListLi = /*#__PURE__*/styled.li(_templateObject2$1t || (_templateObject2$1t = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  border-bottom: 1px solid #f0f2f2;\n  padding: 8px 10px;\n  display: flex;\n  gap: 12px;\n  align-items: center;\n  font-size: 13px;\n  cursor: pointer;\n  &:last-child {\n    border: none;\n  }\n"])));
 
-var ReturnOrderTable = function ReturnOrderTable(_ref) {
-  var loadingskeleton = _ref.loadingskeleton;
+var ReturnOrderTable = function ReturnOrderTable() {
   var _useAtom = useAtom(filtersReducerAtom),
     state = _useAtom[0];
   var _useSelectedOrders = useSelectedOrders(),
     selectedReturnOrder = _useSelectedOrders[0],
     setSelectedReturnOrder = _useSelectedOrders[1];
-  var _useState = useState(false),
-    selectAll = _useState[0],
-    setSelectAll = _useState[1];
+  var _useSelectAll = useSelectAll(),
+    selectAll = _useSelectAll[0],
+    setSelectAll = _useSelectAll[1];
   var filters = state['x-filters'],
     pagination = state['x-pagination'];
   var _useReturnData = useReturnData(),
     returnData = _useReturnData[0],
     setReturnData = _useReturnData[1];
   var _useLoading = useLoading(),
+    load = _useLoading[0],
     setLoading = _useLoading[1];
   var dropdownRefParent = useRef(null);
   var dropdownRef = useRef(null);
@@ -8874,6 +8905,8 @@ var ReturnOrderTable = function ReturnOrderTable(_ref) {
     setNewPayload = _useNewReturnPayload[1];
   var _useGroupedPayload = useGroupedPayload(),
     setGrouped = _useGroupedPayload[1];
+  var _useLocationData = useLocationData(),
+    locationData = _useLocationData[0];
   var OpenDropDown = function OpenDropDown(index) {
     setPrintToggle(function (prevIndex) {
       return prevIndex === index ? null : index;
@@ -8898,56 +8931,75 @@ var ReturnOrderTable = function ReturnOrderTable(_ref) {
       pagination: pagination
     }),
     fetchedOrderData = _useApiHook.data,
-    staticDataLoading = _useApiHook.loading;
+    returnDataLoad = _useApiHook.loading;
   useEffect(function () {
-    setLoading(staticDataLoading);
+    setLoading(returnDataLoad);
     if (fetchedOrderData && fetchedOrderData != null && fetchedOrderData.data) {
       setReturnData(fetchedOrderData == null ? void 0 : fetchedOrderData.data);
     }
-  }, [fetchedOrderData, staticDataLoading]);
+  }, [fetchedOrderData, returnDataLoad]);
+  useEffect(function () {
+    setLoading(returnDataLoad);
+    if (fetchedOrderData && fetchedOrderData != null && fetchedOrderData.data && locationData) {
+      var updatedReturnData = fetchedOrderData.data.map(function (returnItem) {
+        var matchingLocation = locationData.find(function (location) {
+          return (location == null ? void 0 : location.token) === (returnItem == null ? void 0 : returnItem.return_location);
+        });
+        return _extends({}, returnItem, {
+          new_location: matchingLocation ? matchingLocation.location_name : null
+        });
+      });
+      setReturnData(updatedReturnData);
+    }
+  }, [fetchedOrderData, returnDataLoad, locationData]);
   var handleSelectAll = function handleSelectAll(e) {
     setSelectAll(e.target.checked);
     if (e.target.checked) {
       setSelectedReturnOrder(returnData == null ? void 0 : returnData.map(function (loc) {
-        var _loc$return_locations;
         return {
           id: loc.id,
           return_locations: loc == null ? void 0 : loc.return_locations,
           return_location: loc == null ? void 0 : loc.return_location,
-          products: loc.id,
+          products: loc == null ? void 0 : loc.legacy_product_id,
           order_product_return_action: loc == null ? void 0 : loc.order_product_return_action,
-          return_location_token: loc == null || (_loc$return_locations = loc.return_locations) == null ? void 0 : _loc$return_locations.token
+          return_location_token: loc == null ? void 0 : loc.return_location,
+          new_location: loc == null ? void 0 : loc.new_location
         };
       }));
       setNewPayload(returnData == null ? void 0 : returnData.map(function (loc) {
-        var _loc$order_product_re, _loc$return_locations2;
+        var _loc$order_product_re;
         return {
           id: loc.id,
           account_number: createReturn == null ? void 0 : createReturn.account_number,
-          customer_id: createReturn == null ? void 0 : createReturn.customer_id,
-          products: loc.id,
-          return_action: (loc == null || (_loc$order_product_re = loc.order_product_return_action) == null ? void 0 : _loc$order_product_re.type) || null,
-          return_location_token: loc == null || (_loc$return_locations2 = loc.return_locations) == null ? void 0 : _loc$return_locations2.token
+          customer_id: +(createReturn == null ? void 0 : createReturn.customer_id),
+          products: [loc == null ? void 0 : loc.legacy_product_id],
+          return_action: [loc == null || (_loc$order_product_re = loc.order_product_return_action) == null ? void 0 : _loc$order_product_re.type] || null,
+          return_location_token: (loc == null ? void 0 : loc.return_location) || null,
+          new_location: loc == null ? void 0 : loc.new_location
         };
       }));
     } else {
       setSelectedReturnOrder([]);
+      setNewPayload([]);
+      setGrouped([]);
     }
   };
-  var handleSelectOrderReturn = function handleSelectOrderReturn(id, return_location, return_locations, order_product_return_action) {
+  var handleSelectOrderReturn = function handleSelectOrderReturn(id, return_location, return_locations, order_product_return_action, new_location, legacy_product_id) {
     setSelectedReturnOrder(function (prevSelectedLocations) {
       var isSelected = prevSelectedLocations == null ? void 0 : prevSelectedLocations.some(function (loc) {
         return loc.id === id;
       });
+      console.log(new_location, 'new_location');
       if (isSelected) {
         var updatedSelectedLocations = prevSelectedLocations.filter(function (loc) {
           return loc.id !== id;
         });
         setReturnPayload(function (prevState) {
           return _extends({}, prevState, {
-            products: id,
+            products: legacy_product_id,
             return_action: (order_product_return_action == null ? void 0 : order_product_return_action.type) || null,
-            return_location_token: (return_locations == null ? void 0 : return_locations.token) || null
+            return_location_token: return_location || null,
+            new_location: new_location
           });
         });
         setNewPayload(function (prevPayload) {
@@ -8960,26 +9012,28 @@ var ReturnOrderTable = function ReturnOrderTable(_ref) {
         var newReturnPayload = {
           id: id,
           account_number: createReturn == null ? void 0 : createReturn.account_number,
-          customer_id: createReturn == null ? void 0 : createReturn.customer_id,
-          products: id,
-          return_action: (order_product_return_action == null ? void 0 : order_product_return_action.type) || null,
-          return_location_token: (return_locations == null ? void 0 : return_locations.token) || null
+          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_location_token: return_location || null
         };
         setNewPayload(function (prevPayload) {
           return [].concat(prevPayload, [newReturnPayload]);
         });
         setReturnPayload(function (prevState) {
           return _extends({}, prevState, {
-            products: id,
+            products: legacy_product_id,
             return_action: (order_product_return_action == null ? void 0 : order_product_return_action.type) || null,
-            return_location_token: (return_locations == null ? void 0 : return_locations.token) || null
+            return_location_token: return_location || null,
+            new_location: new_location
           });
         });
         return [].concat(prevSelectedLocations, [{
           id: id,
           return_location: return_location,
           return_locations: return_locations,
-          order_product_return_action: order_product_return_action
+          order_product_return_action: order_product_return_action,
+          new_location: new_location
         }]);
       }
     });
@@ -9010,9 +9064,9 @@ var ReturnOrderTable = function ReturnOrderTable(_ref) {
   }, React.createElement(Checkbox$1, {
     checked: selectAll,
     onChange: handleSelectAll
-  })), React.createElement("th", null, "Product Location"), React.createElement("th", null, "Return Location"), React.createElement("th", null, "Recipient"), React.createElement("th", null, "Code"), React.createElement("th", null, " Description"), React.createElement("th", null, "Part"), React.createElement("th", null, "Weight"), React.createElement("th", null, " CBM"), React.createElement("th", null, "Return Reason"), React.createElement("th", null, "Collected"), React.createElement("th", null, "Collection Reason"), React.createElement("th", {
+  })), React.createElement("th", null, "Product Location"), React.createElement("th", null, "Return Location"), React.createElement("th", null, "Recipient"), React.createElement("th", null, "Code"), React.createElement("th", null, "Description"), React.createElement("th", null, "Part"), React.createElement("th", null, "Weight"), React.createElement("th", null, "CBM"), React.createElement("th", null, "Return Reason"), React.createElement("th", null, "Collected"), React.createElement("th", null, "Collection Reason"), React.createElement("th", {
     className: "emailInvoiceShare"
-  }, "Labels"))), React.createElement("tbody", null, loadingskeleton ? React.createElement("tr", null, React.createElement("td", {
+  }, "Labels"))), React.createElement("tbody", null, load ? React.createElement("tr", null, React.createElement("td", {
     colSpan: 6
   }, React.createElement(Skeleton, {
     active: true
@@ -9021,17 +9075,20 @@ var ReturnOrderTable = function ReturnOrderTable(_ref) {
   })) : (returnData == null ? void 0 : returnData.length) === 0 ? React.createElement("tr", null, React.createElement("td", {
     colSpan: 14
   }, React.createElement(EmptyDataContainer, null, React.createElement(Empty, null)))) : returnData == null ? void 0 : returnData.map(function (item, index) {
-    var _item$orders_products, _item$order_data, _item$order_data2, _item$return_reasons, _item$collection_reas;
+    var _item$orders_products, _item$orders_products2, _item$order_data, _item$order_data2, _item$return_reasons, _item$order_product_r, _item$collection_reas;
     return React.createElement("tr", {
       key: item.id
     }, React.createElement("td", null, React.createElement(Checkbox$1, {
+      className: "custom-check",
       checked: selectedReturnOrder == null ? void 0 : selectedReturnOrder.some(function (selectedInvoice) {
         return (selectedInvoice == null ? void 0 : selectedInvoice.id) === item.id;
       }),
       onChange: function onChange() {
-        return handleSelectOrderReturn(item.id, item.return_location, item.return_locations, item.order_product_return_action);
+        return handleSelectOrderReturn(item.id, item.return_location, item.return_locations, item.order_product_return_action, item.new_location, item.legacy_product_id);
       }
-    })), React.createElement("td", null, displayValueOrNA(item == null || (_item$orders_products = item.orders_products_stock) == null ? void 0 : _item$orders_products.location)), React.createElement("td", null, " ", displayValueOrNA(item == null ? void 0 : item.return_location)), React.createElement("td", null, React.createElement("ul", {
+    })), React.createElement("td", null, (item == null || (_item$orders_products = item.orders_products_stock) == null ? void 0 : _item$orders_products.location) !== null && (item == null || (_item$orders_products2 = item.orders_products_stock) == null ? void 0 : _item$orders_products2.location) !== undefined ? item.orders_products_stock.location : React.createElement("div", {
+      className: "awaiting"
+    }, "Awaiting")), React.createElement("td", null, " ", displayValueOrNA(item == null ? void 0 : item.new_location)), React.createElement("td", null, React.createElement("ul", {
       style: {
         listStyleType: 'none',
         padding: 0
@@ -9046,7 +9103,7 @@ var ReturnOrderTable = function ReturnOrderTable(_ref) {
       style: {
         color: '#888075'
       }
-    }, displayValueOrNA(item == null || (_item$order_data2 = item.order_data) == null || (_item$order_data2 = _item$order_data2.order_recipient) == null ? void 0 : _item$order_data2.postcode)))), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.code)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.description)), React.createElement("td", null, "N/A"), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.weight), "KG"), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.cube)), React.createElement("td", null, displayValueOrNA(item == null || (_item$return_reasons = item.return_reasons) == null ? void 0 : _item$return_reasons.reason)), React.createElement("td", null, "N/A"), React.createElement("td", null, displayValueOrNA(item == null || (_item$collection_reas = item.collection_reasons) == null ? void 0 : _item$collection_reas.reason)), React.createElement("td", null, React.createElement("ul", {
+    }, displayValueOrNA(item == null || (_item$order_data2 = item.order_data) == null || (_item$order_data2 = _item$order_data2.order_recipient) == null ? void 0 : _item$order_data2.postcode)))), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.code)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.description)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.parts_count)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.weight), "KG"), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.cube)), React.createElement("td", null, displayValueOrNA(item == null || (_item$return_reasons = item.return_reasons) == null ? void 0 : _item$return_reasons.reason)), React.createElement("td", null, displayValueOrNA(item == null || (_item$order_product_r = item.order_product_returns) == null ? void 0 : _item$order_product_r.collected_at)), React.createElement("td", null, displayValueOrNA(item == null || (_item$collection_reas = item.collection_reasons) == null ? void 0 : _item$collection_reas.reason)), React.createElement("td", null, React.createElement("ul", {
       className: "actionbox"
     }, React.createElement(CustomDrop, {
       ref: dropdownRefParent,
@@ -9058,7 +9115,7 @@ var ReturnOrderTable = function ReturnOrderTable(_ref) {
       }
     }, React.createElement(PrinterIcon, null), React.createElement(DownIcon, null), printToogle == index && React.createElement("div", {
       ref: dropdownRef
-    }, React.createElement(PrintDropDown, null)))))));
+    }, React.createElement(PrintDropDownReturn, null)))))));
   })))));
 };
 
@@ -9729,17 +9786,26 @@ var repackModal = function repackModal() {
 var StyledConatiner$1 = /*#__PURE__*/styled.div(_templateObject$2f || (_templateObject$2f = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  /* text-wrap: nowrap; */\n"])));
 
 var _templateObject$2g, _templateObject2$1D, _templateObject3$X;
+var _excluded$2 = ["id"];
 var CreateReturnModal = function CreateReturnModal() {
-  var _useState = useState([]),
-    selectedlocation = _useState[0],
-    setSelectedLocations = _useState[1];
+  var _useSelectedConfirmLo = useSelectedConfirmLoc(),
+    selectedlocation = _useSelectedConfirmLo[0],
+    setSelectedLocations = _useSelectedConfirmLo[1];
   var _useSelectedOrders = useSelectedOrders(),
     selectedReturnOrder = _useSelectedOrders[0];
+  var _usePostLoading = usePostLoading(),
+    load = _usePostLoading[0];
+  var _useGroupedPayload = useGroupedPayload(),
+    groupedPayload = _useGroupedPayload[0];
+  var _useSelectedConfirmLo2 = useSelectedConfirmLoc(),
+    forDisabledCheck = _useSelectedConfirmLo2[0];
+  var _useFinalPayload = useFinalPayload(),
+    setNew = _useFinalPayload[1];
   var handleSelectLocations = function handleSelectLocations(id) {
     setSelectedLocations(function (prevSelectedLocations) {
-      var isSelected = prevSelectedLocations.includes(id);
+      var isSelected = prevSelectedLocations == null ? void 0 : prevSelectedLocations.includes(id);
       if (isSelected) {
-        return prevSelectedLocations.filter(function (selectedId) {
+        return prevSelectedLocations == null ? void 0 : prevSelectedLocations.filter(function (selectedId) {
           return selectedId !== id;
         });
       } else {
@@ -9747,7 +9813,30 @@ var CreateReturnModal = function CreateReturnModal() {
       }
     });
   };
-  return React.createElement(Wrapper$l, null, React.createElement(Alert, {
+  var uniqueLocations = selectedReturnOrder == null ? void 0 : selectedReturnOrder.reduce(function (acc, current) {
+    var x = acc.find(function (item) {
+      return item.return_location === current.return_location;
+    });
+    if (!x) {
+      acc.push(current);
+    }
+    return acc;
+  }, []);
+  useEffect(function () {
+    if ((groupedPayload == null ? void 0 : groupedPayload.length) > 0 && (forDisabledCheck == null ? void 0 : forDisabledCheck.length) > 0) {
+      var matchedItems = groupedPayload == null ? void 0 : groupedPayload.filter(function (item) {
+        return forDisabledCheck.includes(item.id);
+      });
+      if (matchedItems.length > 0) {
+        var finalPayload = matchedItems == null ? void 0 : matchedItems.map(function (_ref) {
+          var rest = _objectWithoutPropertiesLoose(_ref, _excluded$2);
+          return rest;
+        });
+        setNew(finalPayload);
+      }
+    }
+  }, [forDisabledCheck]);
+  return React.createElement(React.Fragment, null, load && React.createElement(Loader, null), React.createElement(Wrapper$l, null, React.createElement(Alert, {
     onClose: function onClose() {},
     description: "",
     type: "info",
@@ -9758,7 +9847,7 @@ var CreateReturnModal = function CreateReturnModal() {
       listStyle: 'none',
       padding: 0
     }
-  }, selectedReturnOrder == null ? void 0 : selectedReturnOrder.map(function (returnLoc) {
+  }, uniqueLocations == null ? void 0 : uniqueLocations.map(function (returnLoc) {
     return React.createElement("li", {
       key: returnLoc.id,
       style: {
@@ -9767,7 +9856,7 @@ var CreateReturnModal = function CreateReturnModal() {
         alignItems: 'center'
       }
     }, React.createElement(Checkbox$1, {
-      checked: selectedlocation.includes(returnLoc.id),
+      checked: selectedlocation == null ? void 0 : selectedlocation.includes(returnLoc.id),
       onChange: function onChange() {
         return handleSelectLocations(returnLoc.id);
       }
@@ -9775,14 +9864,13 @@ var CreateReturnModal = function CreateReturnModal() {
       style: {
         marginLeft: '8px'
       }
-    }, returnLoc == null ? void 0 : returnLoc.return_location));
-  }))));
+    }, displayValueOrNA(returnLoc == null ? void 0 : returnLoc.new_location)));
+  })))));
 };
 var StyledText$1 = /*#__PURE__*/styled.div(_templateObject$2g || (_templateObject$2g = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: #8d8f90;\n  font-family: Poppins;\n  font-size: 14px;\n  font-style: normal;\n  font-weight: 400;\n"])));
 var Container$1b = /*#__PURE__*/styled.div(_templateObject2$1D || (_templateObject2$1D = /*#__PURE__*/_taggedTemplateLiteralLoose([""])));
 var Wrapper$l = /*#__PURE__*/styled.div(_templateObject3$X || (_templateObject3$X = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  padding: 15px;\n  flex-direction: column;\n  justify-content: center;\n  align-items: flex-start;\n  gap: 15px;\n  align-self: stretch;\n  border-radius: 8px;\n  background: #f8fafc;\n  box-shadow: 0px 1px 3px 0px rgba(16, 24, 40, 0.1);\n"])));
 
-var _excluded$2 = ["id"];
 var ModalManager = function ModalManager() {
   var _useAtom = useAtom(countReducerAtom),
     popupName = _useAtom[0],
@@ -9806,9 +9894,21 @@ var ModalManager = function ModalManager() {
     selectedTab = _useAtom3[0];
   var _useState = useState(false),
     setIsFormValid = _useState[1];
+  var _useFinalPayload = useFinalPayload(),
+    newGrouped = _useFinalPayload[0],
+    setNewGrouped = _useFinalPayload[1];
+  var _usePostLoading = usePostLoading(),
+    SetPostLoading = _usePostLoading[1];
+  var _useSelectedOrders = useSelectedOrders(),
+    setSelectedReturnOrder = _useSelectedOrders[1];
+  var _useSelectedConfirmLo = useSelectedConfirmLoc(),
+    setCheck = _useSelectedConfirmLo[1];
   var _useNewReturnPayload = useNewReturnPayload(),
-    newPayload = _useNewReturnPayload[0],
     setNewPayload = _useNewReturnPayload[1];
+  var _useGroupedPayload = useGroupedPayload(),
+    setGrouped = _useGroupedPayload[1];
+  var _useSelectAll = useSelectAll(),
+    setSelectAll = _useSelectAll[1];
   console.log(orderProduct, 'abcabcabcabcabcabcabcabcabcabcabc');
   var _closeModal = function closeModal() {
     dispatch({
@@ -9984,23 +10084,40 @@ var ModalManager = function ModalManager() {
   var _useApiHook3 = useApiHook({
       endpoint: "return_orders/",
       method: 'POST',
-      body: [newPayload],
+      body: newGrouped,
       performAction: false
     }),
     response = _useApiHook3.data,
-    setShouldPerformAction = _useApiHook3.setShouldPerformAction;
+    setShouldPerformAction = _useApiHook3.setShouldPerformAction,
+    confirmLoading = _useApiHook3.loading;
+  useEffect(function () {
+    SetPostLoading(confirmLoading);
+  }, [confirmLoading]);
+  console.log(response);
+  useEffect(function () {
+    if (response === null || response && response != null && response.data) {
+      dispatch({
+        type: 'close'
+      });
+      setNewGrouped([]);
+      setSelectedReturnOrder([]);
+      setCheck([]);
+      setNewPayload([]);
+      setGrouped([]);
+      setShouldPerformAction(false);
+      setSelectAll(false);
+    }
+  }, [response]);
   var handleConfirmReturn = function handleConfirmReturn() {
-    var payloadWithoutId = newPayload == null ? void 0 : newPayload.map(function (_ref) {
-      var rest = _objectWithoutPropertiesLoose(_ref, _excluded$2);
-      return _extends({}, rest);
-    });
-    console.log(response);
-    if (payloadWithoutId) {
-      setNewPayload(payloadWithoutId);
+    setShouldPerformAction(false);
+    if (newGrouped.length > 0) {
       setShouldPerformAction(true);
     } else {
       setShouldPerformAction(false);
     }
+    dispatch({
+      type: 'close'
+    });
   };
   return React.createElement(React.Fragment, null, (popupName == null ? void 0 : popupName.state) == 'create-return' && React.createElement(AntModal, {
     openStatus: (popupName == null ? void 0 : popupName.state) == 'create-return' ? true : false,
@@ -10016,8 +10133,7 @@ var ModalManager = function ModalManager() {
         name: 'Submit',
         btnStyle: 'rounded',
         onClick: handleConfirmReturn,
-        type: 'button',
-        disabled: !newPayload
+        type: 'button'
       }],
       btnAlign: 'justifyEnd'
     },
@@ -10290,7 +10406,7 @@ 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.createElement("td", null, displayValueOrNA(item == null || (_item$customer_data = item.customer_data) == null ? void 0 : _item$customer_data.customer_name)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.consignment)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.order_number)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.box_count)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.weight), "KG"), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.cube)), React.createElement("td", null, React.createElement(AntSelect, {
+    }, displayValueOrNA(item == null || (_item$order_recipient2 = item.order_recipient) == null ? void 0 : _item$order_recipient2.postcode)))), React.createElement("td", null, displayValueOrNA(item == null || (_item$customer_data = item.customer_data) == null ? void 0 : _item$customer_data.customer_name)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.consignment)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.order_number)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.box_count)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.weight), " KG"), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.cube)), React.createElement("td", null, React.createElement(AntSelect, {
       options: assigneOptions,
       placeholder: "Select",
       onChange: function onChange() {},
@@ -10320,7 +10436,7 @@ var OrderTable = function OrderTable(_ref) {
       }
     }, React.createElement(PrinterIcon, null), React.createElement(DownIcon, null), printToogle == index && React.createElement("div", {
       ref: dropdownRef
-    }, React.createElement(PrintDropDown, null)))), React.createElement("li", {
+    }, React.createElement(PrintDropDownReturn, null)))), React.createElement("li", {
       className: "downloadcontainer"
     }, React.createElement(LoadIcon, null)))));
   })))));
@@ -10410,28 +10526,6 @@ var DateIcon = function DateIcon() {
   }));
 };
 
-var StatusIcon = function StatusIcon() {
-  return React.createElement("svg", {
-    xmlns: "http://www.w3.org/2000/svg",
-    width: "13",
-    height: "12",
-    viewBox: "0 0 13 12",
-    fill: "none"
-  }, React.createElement("path", {
-    d: "M2.60002 6V4.83333C2.60002 3.90507 2.96877 3.01483 3.62514 2.35845C4.28152 1.70208 5.17176 1.33333 6.10002 1.33333C7.02827 1.33333 7.91851 1.70208 8.57489 2.35845C9.23127 3.01483 9.60002 3.90507 9.60002 4.83333V6M1.43335 9.5C1.43335 9.80941 1.55627 10.1062 1.77506 10.325C1.99385 10.5437 2.2906 10.6667 2.60002 10.6667C2.90944 10.6667 3.20618 10.5437 3.42497 10.325C3.64377 10.1062 3.76668 9.80941 3.76668 9.5C3.76668 9.19058 3.64377 8.89383 3.42497 8.67504C3.20618 8.45625 2.90944 8.33333 2.60002 8.33333C2.2906 8.33333 1.99385 8.45625 1.77506 8.67504C1.55627 8.89383 1.43335 9.19058 1.43335 9.5ZM8.43335 9.5C8.43335 9.80941 8.55627 10.1062 8.77506 10.325C8.99385 10.5437 9.2906 10.6667 9.60002 10.6667C9.90944 10.6667 10.2062 10.5437 10.425 10.325C10.6438 10.1062 10.7667 9.80941 10.7667 9.5C10.7667 9.19058 10.6438 8.89383 10.425 8.67504C10.2062 8.45625 9.90944 8.33333 9.60002 8.33333C9.2906 8.33333 8.99385 8.45625 8.77506 8.67504C8.55627 8.89383 8.43335 9.19058 8.43335 9.5Z",
-    stroke: "#6D6B68",
-    "stroke-width": "2",
-    "stroke-linecap": "round",
-    "stroke-linejoin": "round"
-  }), React.createElement("path", {
-    d: "M7.8501 4.25L9.6001 6L11.3501 4.25",
-    stroke: "#6D6B68",
-    "stroke-width": "2",
-    "stroke-linecap": "round",
-    "stroke-linejoin": "round"
-  }));
-};
-
 var ClientIcon = function ClientIcon() {
   return React.createElement("svg", {
     xmlns: "http://www.w3.org/2000/svg",
@@ -10445,28 +10539,6 @@ var ClientIcon = function ClientIcon() {
   }));
 };
 
-var AssigneIcon = function AssigneIcon() {
-  return React.createElement("svg", {
-    xmlns: "http://www.w3.org/2000/svg",
-    width: "15",
-    height: "14",
-    viewBox: "0 0 15 14",
-    fill: "none"
-  }, React.createElement("g", {
-    "clip-path": "url(#clip0_504_13636)"
-  }, React.createElement("path", {
-    d: "M4.4751 1.16667H12.6418V6.70834H11.4751V2.33334H10.3084V5.61051L8.55843 4.7355L6.80843 5.61051V2.33334H5.64176V5.54167H4.4751V1.16667ZM7.9751 2.33334V3.72284L8.55843 3.43117L9.14176 3.72284V2.33334H7.9751ZM5.02051 7.72917C4.92474 7.72892 4.82985 7.74755 4.74127 7.78398C4.65269 7.82041 4.57215 7.87394 4.50426 7.9415L3.30843 9.13734V11.375H6.59085L9.97593 10.5292L12.0363 9.6495C12.1064 9.61158 12.1601 9.54908 12.1871 9.47399C12.214 9.3989 12.2123 9.31652 12.1822 9.24263C12.1521 9.16875 12.0958 9.10857 12.0241 9.07364C11.9524 9.0387 11.8703 9.03147 11.7936 9.05334L11.7819 9.05625L8.0416 9.91667H5.93343V8.75H7.75635C7.89172 8.75 8.02154 8.69623 8.11727 8.60051C8.21299 8.50479 8.26676 8.37496 8.26676 8.23959C8.26676 8.10422 8.21299 7.97439 8.11727 7.87867C8.02154 7.78295 7.89172 7.72917 7.75635 7.72917H5.02051ZM9.42585 8.40117L11.4978 7.92459C11.7185 7.86656 11.9496 7.85988 12.1732 7.90505C12.3969 7.95022 12.6072 8.04605 12.7881 8.18518C12.969 8.3243 13.1155 8.50302 13.2166 8.70762C13.3176 8.91221 13.3704 9.13724 13.3709 9.36542C13.3707 9.64241 13.2934 9.91388 13.1478 10.1495C13.0021 10.3851 12.7938 10.5755 12.5461 10.6995L12.5303 10.7077L10.3487 11.6381L6.73435 12.5417H0.100098V8.3125H2.4836L3.6806 7.1155C3.85696 6.93974 4.06622 6.80044 4.29643 6.70555C4.52663 6.61067 4.77327 6.56206 5.02226 6.5625H7.75635C7.99023 6.56247 8.22153 6.61136 8.4354 6.70603C8.64926 6.8007 8.84096 6.93905 8.99818 7.11221C9.15541 7.28536 9.27467 7.48948 9.34832 7.71146C9.42198 7.93345 9.44838 8.16838 9.42585 8.40117ZM2.14176 9.47917H1.26676V11.375H2.14176V9.47917Z",
-    fill: "#6D6B68"
-  })), React.createElement("defs", null, React.createElement("clipPath", {
-    id: "clip0_504_13636"
-  }, React.createElement("rect", {
-    width: "14",
-    height: "14",
-    fill: "white",
-    transform: "translate(0.100098)"
-  }))));
-};
-
 var initialState$2 = {
   'x-filters': [],
   'x-pagination': {
@@ -10500,20 +10572,16 @@ var filterReducer$1 = function filterReducer(state, action) {
           value: action.payload
         }])
       });
-    // case 'SET_ACTIONS_FILTER':
-    //   return {
-    //     ...state,
-    //     'x-filters': [
-    //       ...state['x-filters'].filter(
-    //         f => f.field !== 'product_return_action_id'
-    //       ),
-    //       {
-    //         field: 'product_return_action_id',
-    //         op: '=',
-    //         value: action.payload,
-    //       },
-    //     ],
-    //   };
+    case 'SET_STATUS_ORDER_FILTER':
+      return _extends({}, state, {
+        'x-filters': [].concat(state['x-filters'].filter(function (f) {
+          return f.field !== 'status_id';
+        }), [{
+          field: 'status_id',
+          op: '=',
+          value: action.payload
+        }])
+      });
     // case 'SET_LOCATION_FILTER':
     //   return {
     //     ...state,
@@ -10551,6 +10619,50 @@ var filtersReducerAtom$1 = /*#__PURE__*/atom(function (get) {
   return set(filtersStateAtom$1, filterReducer$1(get(filtersStateAtom$1), action));
 });
 
+var StatusIcon = function StatusIcon() {
+  return React.createElement("svg", {
+    xmlns: "http://www.w3.org/2000/svg",
+    width: "13",
+    height: "12",
+    viewBox: "0 0 13 12",
+    fill: "none"
+  }, React.createElement("path", {
+    d: "M2.60002 6V4.83333C2.60002 3.90507 2.96877 3.01483 3.62514 2.35845C4.28152 1.70208 5.17176 1.33333 6.10002 1.33333C7.02827 1.33333 7.91851 1.70208 8.57489 2.35845C9.23127 3.01483 9.60002 3.90507 9.60002 4.83333V6M1.43335 9.5C1.43335 9.80941 1.55627 10.1062 1.77506 10.325C1.99385 10.5437 2.2906 10.6667 2.60002 10.6667C2.90944 10.6667 3.20618 10.5437 3.42497 10.325C3.64377 10.1062 3.76668 9.80941 3.76668 9.5C3.76668 9.19058 3.64377 8.89383 3.42497 8.67504C3.20618 8.45625 2.90944 8.33333 2.60002 8.33333C2.2906 8.33333 1.99385 8.45625 1.77506 8.67504C1.55627 8.89383 1.43335 9.19058 1.43335 9.5ZM8.43335 9.5C8.43335 9.80941 8.55627 10.1062 8.77506 10.325C8.99385 10.5437 9.2906 10.6667 9.60002 10.6667C9.90944 10.6667 10.2062 10.5437 10.425 10.325C10.6438 10.1062 10.7667 9.80941 10.7667 9.5C10.7667 9.19058 10.6438 8.89383 10.425 8.67504C10.2062 8.45625 9.90944 8.33333 9.60002 8.33333C9.2906 8.33333 8.99385 8.45625 8.77506 8.67504C8.55627 8.89383 8.43335 9.19058 8.43335 9.5Z",
+    stroke: "#6D6B68",
+    "stroke-width": "2",
+    "stroke-linecap": "round",
+    "stroke-linejoin": "round"
+  }), React.createElement("path", {
+    d: "M7.8501 4.25L9.6001 6L11.3501 4.25",
+    stroke: "#6D6B68",
+    "stroke-width": "2",
+    "stroke-linecap": "round",
+    "stroke-linejoin": "round"
+  }));
+};
+
+var AssigneIcon = function AssigneIcon() {
+  return React.createElement("svg", {
+    xmlns: "http://www.w3.org/2000/svg",
+    width: "15",
+    height: "14",
+    viewBox: "0 0 15 14",
+    fill: "none"
+  }, React.createElement("g", {
+    "clip-path": "url(#clip0_504_13636)"
+  }, React.createElement("path", {
+    d: "M4.4751 1.16667H12.6418V6.70834H11.4751V2.33334H10.3084V5.61051L8.55843 4.7355L6.80843 5.61051V2.33334H5.64176V5.54167H4.4751V1.16667ZM7.9751 2.33334V3.72284L8.55843 3.43117L9.14176 3.72284V2.33334H7.9751ZM5.02051 7.72917C4.92474 7.72892 4.82985 7.74755 4.74127 7.78398C4.65269 7.82041 4.57215 7.87394 4.50426 7.9415L3.30843 9.13734V11.375H6.59085L9.97593 10.5292L12.0363 9.6495C12.1064 9.61158 12.1601 9.54908 12.1871 9.47399C12.214 9.3989 12.2123 9.31652 12.1822 9.24263C12.1521 9.16875 12.0958 9.10857 12.0241 9.07364C11.9524 9.0387 11.8703 9.03147 11.7936 9.05334L11.7819 9.05625L8.0416 9.91667H5.93343V8.75H7.75635C7.89172 8.75 8.02154 8.69623 8.11727 8.60051C8.21299 8.50479 8.26676 8.37496 8.26676 8.23959C8.26676 8.10422 8.21299 7.97439 8.11727 7.87867C8.02154 7.78295 7.89172 7.72917 7.75635 7.72917H5.02051ZM9.42585 8.40117L11.4978 7.92459C11.7185 7.86656 11.9496 7.85988 12.1732 7.90505C12.3969 7.95022 12.6072 8.04605 12.7881 8.18518C12.969 8.3243 13.1155 8.50302 13.2166 8.70762C13.3176 8.91221 13.3704 9.13724 13.3709 9.36542C13.3707 9.64241 13.2934 9.91388 13.1478 10.1495C13.0021 10.3851 12.7938 10.5755 12.5461 10.6995L12.5303 10.7077L10.3487 11.6381L6.73435 12.5417H0.100098V8.3125H2.4836L3.6806 7.1155C3.85696 6.93974 4.06622 6.80044 4.29643 6.70555C4.52663 6.61067 4.77327 6.56206 5.02226 6.5625H7.75635C7.99023 6.56247 8.22153 6.61136 8.4354 6.70603C8.64926 6.8007 8.84096 6.93905 8.99818 7.11221C9.15541 7.28536 9.27467 7.48948 9.34832 7.71146C9.42198 7.93345 9.44838 8.16838 9.42585 8.40117ZM2.14176 9.47917H1.26676V11.375H2.14176V9.47917Z",
+    fill: "#6D6B68"
+  })), React.createElement("defs", null, React.createElement("clipPath", {
+    id: "clip0_504_13636"
+  }, React.createElement("rect", {
+    width: "14",
+    height: "14",
+    fill: "white",
+    transform: "translate(0.100098)"
+  }))));
+};
+
 var _templateObject$2j, _templateObject2$1G;
 var ReturnOrderFilter = function ReturnOrderFilter() {
   var _useAtom = useAtom(filtersReducerAtom$1),
@@ -10560,22 +10672,15 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
   var _useState = useState(),
     selectedDate = _useState[0],
     setSelectedDate = _useState[1];
-  var zoneOptions = [{
-    label: 'Zone 1',
-    value: 'zone1'
-  }, {
-    label: 'Zone 2',
-    value: 'zone2'
-  }, {
-    label: 'Zone 3',
-    value: 'zone3'
-  }, {
-    label: 'Zone 4',
-    value: 'zone4'
-  }, {
-    label: 'Zone 5',
-    value: 'zone5'
-  }];
+  var _useStatusOrderData = useStatusOrderData(),
+    statusOfOrder = _useStatusOrderData[0];
+  // const zoneOptions = [
+  //   { label: 'Zone 1', value: 'zone1' },
+  //   { label: 'Zone 2', value: 'zone2' },
+  //   { label: 'Zone 3', value: 'zone3' },
+  //   { label: 'Zone 4', value: 'zone4' },
+  //   { label: 'Zone 5', value: 'zone5' },
+  // ];
   // date change here
   var handleDateChange = function handleDateChange(date) {
     setSelectedDate(date ? date == null ? void 0 : date.$d : null);
@@ -10598,6 +10703,14 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
       value: option == null ? void 0 : option.id
     };
   });
+  //status of order
+  var orderOptions = statusOfOrder == null ? void 0 : statusOfOrder.map(function (option) {
+    var _option$status_type, _option$status_type2;
+    return {
+      label: (option == null || (_option$status_type = option.status_type) == null || (_option$status_type = _option$status_type.charAt(0)) == null ? void 0 : _option$status_type.toUpperCase()) + (option == null || (_option$status_type2 = option.status_type) == null ? void 0 : _option$status_type2.slice(1)),
+      value: option == null ? void 0 : option.id
+    };
+  });
   var handleClientChange = function handleClientChange(value) {
     console.log(value, 'value');
     dispatch({
@@ -10605,6 +10718,13 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
       payload: value
     });
   };
+  var handleStatusOfOrder = function handleStatusOfOrder(value) {
+    console.log(value, 'value');
+    dispatch({
+      type: 'SET_STATUS_ORDER_FILTER',
+      payload: value
+    });
+  };
   return React.createElement(React.Fragment, null, React.createElement(StyledFiter, null, React.createElement(StyledFIlterELements, null, React.createElement(LeftSideConatiner, null, React.createElement("div", {
     className: "filtercontainer"
   }, React.createElement("div", {
@@ -10630,25 +10750,14 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
   }, React.createElement("div", {
     className: "dateiconcontainer"
   }, React.createElement(StatusIcon, null)), React.createElement(StyledAntSelect$d, null, React.createElement(Select, {
-    options: zoneOptions,
+    options: orderOptions,
     className: "custom-select",
     placeholder: "Status of Order",
-    onChange: function onChange() {},
+    onChange: handleStatusOfOrder,
     style: {
-      minWidth: '115px'
+      minWidth: '130px'
     },
-    maxTagCount: 0,
-    maxTagPlaceholder: function maxTagPlaceholder(omittedValues) {
-      return React.createElement(Tooltip, {
-        overlayStyle: {
-          pointerEvents: 'none'
-        },
-        title: omittedValues.map(function (_ref) {
-          var label = _ref.label;
-          return label;
-        }).join(', ')
-      }, React.createElement("span", null, omittedValues.length + " selected"));
-    }
+    allowClear: true
   }))), React.createElement("div", {
     className: "datefilter"
   }, React.createElement("div", {
@@ -10659,49 +10768,19 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
     placeholder: "Client",
     onChange: handleClientChange,
     style: {
-      width: '125px'
+      width: '125px',
+      border: 'none'
     },
-    maxTagCount: 0,
-    maxTagPlaceholder: function maxTagPlaceholder(omittedValues) {
-      return React.createElement(Tooltip, {
-        overlayStyle: {
-          pointerEvents: 'none'
-        },
-        title: omittedValues.map(function (_ref2) {
-          var label = _ref2.label;
-          return label;
-        }).join(', ')
-      }, React.createElement("span", null, omittedValues.length + " selected"));
-    }
+    allowClear: true
   }))), React.createElement("div", {
     className: "datefilter"
   }, React.createElement("div", {
     className: "dateiconcontainer"
-  }, React.createElement(AssigneIcon, null)), React.createElement(StyledAntSelect$d, null, React.createElement(Select, {
-    options: zoneOptions,
-    className: "custom-select",
-    placeholder: "Asignee",
-    onChange: function onChange() {},
-    style: {
-      minWidth: '100px'
-    },
-    maxTagCount: 0,
-    maxTagPlaceholder: function maxTagPlaceholder(omittedValues) {
-      return React.createElement(Tooltip, {
-        overlayStyle: {
-          pointerEvents: 'none'
-        },
-        title: omittedValues.map(function (_ref3) {
-          var label = _ref3.label;
-          return label;
-        }).join(', ')
-      }, React.createElement("span", null, omittedValues.length + " selected"));
-    }
-  }))))), React.createElement(TableFilters, null)));
+  }, React.createElement(AssigneIcon, null))))), React.createElement(TableFilters, null)));
 };
 var StyledDatePicker = /*#__PURE__*/styled.div(_templateObject$2j || (_templateObject$2j = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  .custom-datepicker {\n    border: none;\n  }\n"])));
 // const DropdownContainer = styled.div``;
-var StyledAntSelect$d = /*#__PURE__*/styled.div(_templateObject2$1G || (_templateObject2$1G = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  .custom-select {\n    border: none;\n    width: 80px;\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\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$d = /*#__PURE__*/styled.div(_templateObject2$1G || (_templateObject2$1G = /*#__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\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 _templateObject$2k, _templateObject2$1H;
 var ReturnAfterTable = function ReturnAfterTable() {
@@ -10886,7 +10965,7 @@ function ReturnMainTable() {
     }),
     fetchedClientData = _useApiHook.data,
     staticDataLoading = _useApiHook.loading;
-  console.log('fetchedClientData', fetchedClientData == null ? void 0 : fetchedClientData.data);
+  // console.log('fetchedClientData', fetchedClientData?.data);
   useEffect(function () {
     setLoading(staticDataLoading);
     if (fetchedClientData && fetchedClientData.data) {