@bjsdistribution/dms-client-return 0.0.54 → 0.0.56

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

@@ -548,7 +548,6 @@ function CopyText(props) {
 var IconContainer = /*#__PURE__*/styled.div(_templateObject$1 || (_templateObject$1 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  cursor: pointer;\n"])));
 
 var currentActionAtom = /*#__PURE__*/atom(undefined);
-var isOnHold = /*#__PURE__*/atom(false);
 var orderStaticDataAtom = /*#__PURE__*/atom({});
 var customerInfoAtom = /*#__PURE__*/atom({
   recipient_name: '',
@@ -638,9 +637,6 @@ function useOrderStaticData() {
 function useCustomerInfo() {
   return useAtom(customerInfoAtom);
 }
-function useIsOnHoldOrder() {
-  return useAtom(isOnHold);
-}
 //value
 var orderId = /*#__PURE__*/atom([]);
 var useOrderId = function useOrderId() {
@@ -3617,7 +3613,7 @@ var ReturnProductTable = function ReturnProductTable() {
     if (isresponse && isresponse.data) {
       notification.success({
         message: 'Success',
-        description: 'An error has occurred. Please try again later.'
+        description: 'Successfully Delete Order Product.'
       });
       handleRemoveRow();
       setSelectedRowId(null);
@@ -3639,7 +3635,7 @@ var ReturnProductTable = function ReturnProductTable() {
     if (selectAll) {
       setSelectedProducts([]);
     } else {
-      var allProductIds = productData.map(function (product) {
+      var allProductIds = productData == null ? void 0 : productData.map(function (product) {
         return product.id;
       });
       setSelectedProducts(allProductIds);
@@ -3667,6 +3663,7 @@ var ReturnProductTable = function ReturnProductTable() {
     });
     return matchedReason ? matchedReason.label : 'N/A';
   };
+  var disableCheckbox = (productData == null ? void 0 : productData.length) == 0;
   return React.createElement("div", null, loading && React.createElement(Loader, {
     title: "Deleting"
   }), React.createElement(StyledTableWrapper, {
@@ -3675,6 +3672,7 @@ var ReturnProductTable = function ReturnProductTable() {
   }, React.createElement(StyledTable$1, null, React.createElement("thead", null, React.createElement("tr", null, React.createElement("th", {
     className: "emailproductsCheckbox"
   }, React.createElement(Checkbox$1, {
+    disabled: disableCheckbox,
     checked: selectAll,
     onChange: handleSelectAll
   })), React.createElement("th", null, "Location"), React.createElement("th", null, "Sender"), React.createElement("th", null, "Code"), React.createElement("th", null, "Description"), React.createElement("th", null, "Return Reason"), React.createElement("th", null, "Part"), React.createElement("th", null, "Action"))), React.createElement("tbody", null, productData && (productData == null ? void 0 : productData.length) > 0 ? productData == null ? void 0 : productData.map(function (product) {
@@ -3733,6 +3731,8 @@ var NewReturnDropdown = function NewReturnDropdown() {
   var _useState3 = useState(),
     idProduct = _useState3[0],
     setId = _useState3[1];
+  var _useOrderId = useOrderId(),
+    orderId = _useOrderId[0];
   var id = orderData == null ? void 0 : orderData.customer_id;
   useEffect(function () {
     var allProductIds = (productData == null ? void 0 : productData.map(function (product) {
@@ -3752,6 +3752,10 @@ var NewReturnDropdown = function NewReturnDropdown() {
     field: 'status',
     op: '!=',
     value: 'SD'
+  }, {
+    field: 'id',
+    op: '!=',
+    value: orderId
   }];
   if ((idProduct == null ? void 0 : idProduct.length) > 0 && idProduct[0]) {
     filters.push({
@@ -5432,7 +5436,11 @@ function NotesTable() {
         fontWeight: 'bold',
         textTransform: 'capitalize'
       }
-    }, order == null ? void 0 : order.created_by), React.createElement("div", null, format(new Date(order == null ? void 0 : order.created_at), "dd/MM/yyyy '@' HH:mm"))), React.createElement("td", null, order == null ? void 0 : order.description));
+    }, order == null ? void 0 : order.created_by), React.createElement("div", null, format(new Date(order == null ? void 0 : order.created_at), "dd/MM/yyyy '@' HH:mm"))), React.createElement("td", {
+      dangerouslySetInnerHTML: {
+        __html: order == null ? void 0 : order.description
+      }
+    }));
   })))));
 }
 var Title$4 = /*#__PURE__*/styled.h2(_templateObject$1m || (_templateObject$1m = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: #3a3630;\n  font-family: 'Roboto', sans-serif;\n  font-size: 16px;\n  font-style: normal;\n  font-weight: 500;\n  text-transform: uppercase;\n  padding: 0;\n  margin: 0;\n"])));
@@ -5737,51 +5745,27 @@ function SendEmailModal() {
   })));
 }
 
-var OptionsMenu = [{
-  label: 'Log Service Refusal',
-  value: 'log-service-refusal'
+var bjsMenu = [
+// {
+//   label: 'Add Order Resources',
+//   value: 'add-resources',
+// },
+{
+  label: 'Split Order',
+  value: 'split-order'
+}];
+var optionsMenu = [{
+  label: 'Create Reminder',
+  value: 'create-task'
 }, {
   label: 'Confirm',
   value: 'confirm-order'
 }, {
-  label: 'Force Debrief',
-  value: 'force-debrief'
-}, {
-  label: 'Charge Log',
-  value: 'charge-log'
-}, {
-  label: 'Log Feedback',
-  value: 'log-feedback'
-}, {
-  label: 'On Hold',
+  label: 'Hold',
   value: 'hold-order'
-}, {
-  label: 'Un Hold',
-  value: 'unhold-order'
-}, {
-  label: 'Change Customer Account',
-  value: 'change-customer-account'
-}, {
-  label: 'Proximity Report',
-  value: 'promixity-report'
-}, {
-  label: 'Raise Collection',
-  value: 'raise-collection'
-}, {
-  label: 'Remove from Route',
-  value: 'remove-from-route'
-}, {
-  label: 'Add New Flag',
-  value: 'add-new-flag'
-}, {
-  label: 'Un-Release Order',
-  value: 'unrelease-order'
 }, {
   label: 'Cancel',
   value: 'cancel-order'
-}, {
-  label: 'Clear Booking Status',
-  value: 'clear-booking-status'
 }];
 var PrintMenu = [{
   label: 'Return Notes',
@@ -5815,7 +5799,7 @@ function ChangeCustomerAccModal() {
     infoText: "632801 (OFS)",
     submitBtnTitle: "Save Details"
   }, React.createElement(ContentContainer$5, null, React.createElement(SplitLayout, null, React.createElement(Row$4, null, React.createElement(Label$d, null, "New Customer"), React.createElement(AntSelect, {
-    options: OptionsMenu,
+    options: optionsMenu,
     placeholder: "Select Customer",
     onChange: handleSelectChange,
     disabled: false,
@@ -5827,7 +5811,7 @@ function ChangeCustomerAccModal() {
     popupClassName: 'dropDownStyle',
     selectWrapperClass: 'rounded'
   })), React.createElement(Row$4, null, React.createElement(Label$d, null, "New Trading Name"), React.createElement(AntSelect, {
-    options: OptionsMenu,
+    options: optionsMenu,
     placeholder: "Select Trading Name",
     onChange: handleSelectChange,
     disabled: false,
@@ -6309,20 +6293,71 @@ function ChargeLog() {
 
 var _templateObject$1s;
 var UnholdOrder = function UnholdOrder() {
+  var _useOrderId = useOrderId(),
+    orderId = _useOrderId[0];
   var _useCurrentAction = useCurrentAction(),
     setCurrentAction = _useCurrentAction[1];
-  var _useIsOnHoldOrder = useIsOnHoldOrder(),
-    setOnHoldOrder = _useIsOnHoldOrder[1];
+  var _useOrderDetails = useOrderDetails(),
+    setOrderDetails = _useOrderDetails[1];
+  var _usePrevOrderDetails = usePrevOrderDetails(),
+    setPrevOrderDetails = _usePrevOrderDetails[1];
+  var _useLoading = useLoading(),
+    setLoading = _useLoading[1];
+  var _useApiHook = useApiHook({
+      endpoint: "orders/" + orderId + "/unhold/?unhold_reason=\"unhold\"",
+      method: 'POST',
+      performAction: false
+    }),
+    response = _useApiHook.data,
+    setPerformAction = _useApiHook.setShouldPerformAction;
+  var _useApiHook2 = useApiHook({
+      endpoint: "orders/" + orderId,
+      method: 'GET',
+      performAction: false
+    }),
+    fetchedData = _useApiHook2.data,
+    loading = _useApiHook2.loading,
+    setShouldPerformAction = _useApiHook2.setShouldPerformAction;
+  useEffect(function () {
+    var _fetchedData$data;
+    setLoading(loading);
+    if (fetchedData && fetchedData.data) {
+      var requiredData = fetchedData == null ? void 0 : fetchedData.data;
+      setOrderDetails(requiredData[0]);
+      setPrevOrderDetails(requiredData[0]);
+      setCurrentAction(undefined);
+    }
+    if (fetchedData && (fetchedData == null ? void 0 : fetchedData.data) === null || (fetchedData == null || (_fetchedData$data = fetchedData.data) == null ? void 0 : _fetchedData$data.length) === 0) {
+      setCurrentAction(undefined);
+    }
+  }, [loading]);
+  useEffect(function () {
+    if (response) {
+      //@ts-ignore
+      if (response != null && response.data && (response == null ? void 0 : response.code) === 200) {
+        setShouldPerformAction(true);
+      } else {
+        notification.error({
+          message: 'Error',
+          description:
+          //@ts-ignore
+          (response == null ? void 0 : response.error_traceback) || 'An error has occurred. Please try again later.'
+        });
+        setCurrentAction(undefined);
+      }
+    }
+  }, [response]);
   var saveButton = function saveButton() {
-    setOnHoldOrder(false);
-    setCurrentAction(undefined);
+    if (orderId) {
+      setPerformAction(true);
+    }
   };
   var closeModal = function closeModal() {
     setCurrentAction(undefined);
   };
   return React.createElement(CancelationModal, {
-    title: "Un-hold Order",
-    description: "Are you sure, you want to Un-Hold the Order?",
+    title: "Unhold Order",
+    description: "Are you sure, you want to UnHold the Order?",
     actions: React.createElement(CustomCancelAndCompleteAction, {
       cancelLabel: "Cancel",
       onCancel: closeModal,
@@ -8178,187 +8213,133 @@ var DetailsContainer = /*#__PURE__*/styled.div(_templateObject$1J || (_templateO
 var Typo = /*#__PURE__*/styled.div(_templateObject2$1m || (_templateObject2$1m = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  font-size: 20px;\n  font-style: normal;\n  font-weight: 600;\n  line-height: 32px; /* 160% */\n  text-transform: uppercase;\n  margin: 0;\n  padding: 0;\n\n  @media screen and (max-width: 1220px) {\n    font-size: 14px;\n  }\n"])));
 
 var _templateObject$1K;
-var DropDownContainer$1 = /*#__PURE__*/styled.div(_templateObject$1K || (_templateObject$1K = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  gap: 20px;\n  border-right: 1px solid #d0d5dd;\n  padding: 4px;\n  @media screen and (max-width: 1220px) {\n    font-size: 12px;\n  }\n"])));
-
-var _templateObject$1L;
-var DropDownItem = function DropDownItem(_ref) {
-  var label = _ref.label,
-    icon = _ref.icon,
-    onClick = _ref.onClick;
-  return React.createElement(Flex$2, {
-    onClick: onClick
-  }, React.createElement("label", null, label), icon);
-};
-var Flex$2 = /*#__PURE__*/styled.div(_templateObject$1L || (_templateObject$1L = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  align-items: center;\n  display: flex;\n  position: relative;\n  label {\n    color: #3a3630;\n    font-size: 14px;\n    line-height: 18px;\n    cursor: pointer;\n  }\n"])));
-
-var _templateObject$1M;
-var DropDownMenu = function DropDownMenu(_ref) {
-  var options = _ref.options,
-    onSelect = _ref.onSelect;
-  return React.createElement(DropDownContent, null, options.map(function (option) {
-    return React.createElement(DropDownItem, {
-      key: option.value,
-      label: option.label,
-      icon: '',
-      onClick: function onClick() {
-        return onSelect(option.value);
-      }
-    });
-  }));
-};
-var DropDownContent = /*#__PURE__*/styled.div(_templateObject$1M || (_templateObject$1M = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  width: 173px;\n  position: absolute;\n  flex-direction: column;\n  align-items: flex-start;\n  gap: 7px;\n  padding-left: 28px;\n  top: 46px;\n  background-color: white;\n  border: 1px solid #ddd;\n  box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);\n  z-index: 1;\n  border-radius: 10px;\n  padding: 8px 8px 10px 16px;\n"])));
-
-var DropDownLarge = function DropDownLarge() {
-  return React.createElement("svg", {
-    className: "arrowDown",
-    xmlns: "http://www.w3.org/2000/svg",
-    width: "24",
-    height: "24",
-    viewBox: "0 0 24 24",
-    fill: "none"
-  }, React.createElement("rect", {
-    width: "24",
-    height: "24",
-    fill: "none"
-  }), React.createElement("path", {
-    opacity: "0.4",
-    fillRule: "evenodd",
-    clipRule: "evenodd",
-    d: "M6.69128 9.8912C6.82628 9.75637 7.00928 9.68063 7.20008 9.68063C7.39088 9.68063 7.57388 9.75637 7.70888 9.8912L12.0001 14.1824L16.2913 9.8912C16.4278 9.76402 16.6083 9.69478 16.7948 9.69807C16.9814 9.70136 17.1593 9.77693 17.2912 9.90884C17.4232 10.0408 17.4987 10.2187 17.502 10.4053C17.5053 10.5918 17.4361 10.7723 17.3089 10.9088L12.5089 15.7088C12.3739 15.8436 12.1909 15.9194 12.0001 15.9194C11.8093 15.9194 11.6263 15.8436 11.4913 15.7088L6.69128 10.9088C6.55645 10.7738 6.48071 10.5908 6.48071 10.4C6.48071 10.2092 6.55645 10.0262 6.69128 9.8912Z",
-    fill: "#3A3630"
-  }));
-};
-
-var Options = [{
-  label: 'Create Reminder',
-  value: 'create-task'
-}, {
-  label: 'Confirm',
-  value: 'confirm-order'
-},
-// { label: 'Force Debrief', value: 'force-debrief' },
-// { label: 'Clear Booking Status', value: 'booking-status' },
-// { label: 'Remove From Route', value: 'remove-route' },
-{
-  label: 'Hold',
-  value: 'hold-order'
-},
-// { label: 'Flag', value: 'view-flag' },
-{
-  label: 'Cancel',
-  value: 'cancel-order'
-}, {
-  label: 'Charge Log',
-  value: 'charge-log'
-}];
-var OptionsDropDown = function OptionsDropDown() {
-  var _useState = useState(false),
-    isOpen = _useState[0],
-    setIsOpen = _useState[1];
-  var dropdownRef = useRef(null);
+function Options() {
   var _useCurrentAction = useCurrentAction(),
     setCurrentAction = _useCurrentAction[1];
-  var _useIsOnHoldOrder = useIsOnHoldOrder(),
-    hold = _useIsOnHoldOrder[0];
-  // console.log(action, 'action');
-  var handleClick = function handleClick() {
-    setIsOpen(function (prev) {
-      return !prev;
-    });
+  var handleSelectChange = function handleSelectChange(selectedOption) {
+    setCurrentAction(selectedOption.value);
   };
-  var filteredOptions = Options == null ? void 0 : Options.filter(function (option) {
-    if (hold) {
-      return option.value !== 'hold-order';
-    } else {
-      return option.value !== 'unhold-order';
+  var _useOrderDetails = useOrderDetails(),
+    orderDetails = _useOrderDetails[0];
+  var isOrderOnHold = (orderDetails == null ? void 0 : orderDetails.status) === 'OO';
+  var isOrderCancelled = (orderDetails == null ? void 0 : orderDetails.status) === 'CO';
+  var filteredOptions = optionsMenu.filter(function (option) {
+    var shouldExclude = false;
+    if (isOrderOnHold && option.value === 'hold-order') {
+      shouldExclude = true;
+    }
+    if (isOrderCancelled && option.value === 'cancel-order') {
+      shouldExclude = true;
+    }
+    if (!isOrderCancelled || isOrderOnHold) {
+      if (option.value === 'uncancel-order') {
+        shouldExclude = true;
+      }
     }
+    if (!isOrderOnHold && option.value === 'unhold-order') {
+      shouldExclude = true;
+    }
+    return !shouldExclude;
   });
-  var handleSelect = function handleSelect(selectedOption) {
-    setCurrentAction(selectedOption);
-    setIsOpen(false);
-  };
-  useEffect(function () {
-    var handleClickOutside = function handleClickOutside(event) {
-      if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
-        setIsOpen(false);
-      }
-    };
-    document.addEventListener('mousedown', handleClickOutside);
-    return function () {
-      document.removeEventListener('mousedown', handleClickOutside);
-    };
-  }, []);
-  return React.createElement(DropDownContainer$1, {
-    ref: dropdownRef
-  }, React.createElement(DropDownItem, {
-    label: "Options",
-    icon: React.createElement(DropDownLarge, null),
-    onClick: handleClick
-  }), isOpen && React.createElement(DropDownMenu, {
+  return React.createElement(Option, null, React.createElement(SelectDropdown, {
+    placeholder: "OPTIONS",
+    inputId: "bjsmenu",
     options: filteredOptions,
-    onSelect: handleSelect
+    onChange: handleSelectChange,
+    isSearchable: false,
+    styles: _extends({}, dropdownStyles, filterDropdownStyles, {
+      container: function container(styles) {
+        return _extends({}, styles, {
+          cursor: 'pointer'
+        });
+      },
+      menu: function menu(styles) {
+        return _extends({}, styles, {
+          top: '113%',
+          borderRadius: '5px',
+          width: 'max-content',
+          cursor: 'pointer'
+        });
+      },
+      control: function control(styles) {
+        return _extends({}, styles, {
+          width: '105px',
+          boxShadow: 'none',
+          borderColor: 'transparent',
+          cursor: 'pointer',
+          backgroundColor: 'transparent',
+          '&:hover': {
+            boxShadow: 'none',
+            borderColor: 'transparent'
+          }
+        });
+      }
+    }),
+    value: "OPTIONS"
   }));
-};
+}
+var Option = /*#__PURE__*/styled.div(_templateObject$1K || (_templateObject$1K = /*#__PURE__*/_taggedTemplateLiteralLoose([""])));
 
-var Options$1 = [
-// { label: 'Add Order Resource ', value: 'add-order-resources' },
-{
-  label: 'Split Order ',
-  value: 'split-order'
-}];
-var MenuDropDown = function MenuDropDown() {
-  var _useState = useState(false),
-    isOpen = _useState[0],
-    setIsOpen = _useState[1];
-  var dropdownRef = useRef(null);
+function BjsMenu() {
+  var _orderStatus$;
   var _useCurrentAction = useCurrentAction(),
     setCurrentAction = _useCurrentAction[1];
-  var handleClick = function handleClick() {
-    setIsOpen(function (prev) {
-      return !prev;
-    });
-  };
-  var handleSelect = function handleSelect(selectedOption) {
-    setCurrentAction(selectedOption);
-    setIsOpen(false);
+  var handleSelectChange = function handleSelectChange(selectedOption) {
+    setCurrentAction(selectedOption.value);
   };
-  useEffect(function () {
-    var handleClickOutside = function handleClickOutside(event) {
-      if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
-        setIsOpen(false);
+  var _useStatusDetails = useStatusDetails(),
+    orderStatus = _useStatusDetails[0];
+  var isReleased = (_orderStatus$ = orderStatus[0]) == null ? void 0 : _orderStatus$.released;
+  var filteredOptions = bjsMenu.filter(function (option) {
+    if (isReleased) {
+      return option.value !== 'release-order';
+    } else {
+      return option;
+    }
+  });
+  return React.createElement(SelectDropdown, {
+    placeholder: "BJS MENU",
+    inputId: "bjsmenu",
+    options: filteredOptions,
+    onChange: handleSelectChange,
+    isSearchable: false,
+    styles: _extends({}, dropdownStyles, filterDropdownStyles, {
+      container: function container(styles) {
+        return _extends({}, styles, {
+          cursor: 'pointer'
+        });
+      },
+      menu: function menu(styles) {
+        return _extends({}, styles, {
+          top: '113%',
+          borderRadius: '5px',
+          width: 'max-content',
+          cursor: 'pointer'
+        });
+      },
+      control: function control(styles) {
+        return _extends({}, styles, {
+          width: '105px',
+          boxShadow: 'none',
+          borderColor: 'transparent',
+          cursor: 'pointer',
+          backgroundColor: 'transparent',
+          '&:hover': {
+            boxShadow: 'none',
+            borderColor: 'transparent'
+          }
+        });
       }
-    };
-    document.addEventListener('mousedown', handleClickOutside);
-    return function () {
-      document.removeEventListener('mousedown', handleClickOutside);
-    };
-  }, []);
-  return React.createElement(DropDownContainer$1, {
-    ref: dropdownRef
-  }, React.createElement(DropDownItem, {
-    label: "BJS MENU",
-    icon: React.createElement(DropDownLarge, null),
-    onClick: handleClick
-  }), isOpen && React.createElement(DropDownMenu, {
-    options: Options$1,
-    onSelect: handleSelect
-  }));
-};
+    }),
+    value: "BJS MENU"
+  });
+}
 
+var _templateObject$1L;
 function Print() {
   var _useOrderDetails = useOrderDetails(),
     orderDetails = _useOrderDetails[0];
   var gsitId = orderDetails == null ? void 0 : orderDetails.gsit_order_id;
-  var dropdownRef = useRef(null);
-  // console.log(gsitId, 'gsitId');
-  var _useState = useState(false),
-    isOpen = _useState[0],
-    setIsOpen = _useState[1];
-  var handleClick = function handleClick() {
-    setIsOpen(function (prev) {
-      return !prev;
-    });
-  };
   var getEnvironment = function getEnvironment() {
     console.log('project env', process.env.REACT_APP_API_PATH);
     return process.env.REACT_APP_API_PATH === 'https://us.dms.api.bjshomedelivery.com' ? 'us' : 'development';
@@ -8374,68 +8355,94 @@ function Print() {
     if (val === 'Proof Of Delivery') {
       return '';
     }
-    if (val === 'Proof Of Delivery(DOC)') {
+    if (val === 'proofofdelivery(doc)') {
       return '';
     }
-    if (val === 'Order Delivery labels') {
+    if (val === 'orderdeliverylabels') {
       return baseUrl + "/generate_labels?pdf=true&product_type=Deliver&order_id=" + gsitId;
     }
-    // if (val === 'ordercollectionlabels') {
-    //   return `${baseUrl}/generate_labels?pdf=true&product_type=Collect&order_id=${gsitId}`;
-    // }
-    // if (val === 'orderreturnlabels') {
-    //   return `${baseUrl}/generate_labels?pdf=true&product_type=Return&order_id=${gsitId}`;
-    // }
-    // if (val === 'returnscovernote') {
-    //   return '';
-    // }
-    else {
+    if (val === 'ordercollectionlabels') {
+      return baseUrl + "/generate_labels?pdf=true&product_type=Collect&order_id=" + gsitId;
+    }
+    if (val === 'orderreturnlabels') {
+      return baseUrl + "/generate_labels?pdf=true&product_type=Return&order_id=" + gsitId;
+    }
+    if (val === 'returnscovernote') {
+      return '';
+    } else {
       return '';
     }
   };
   var handleSelectChange = function handleSelectChange(selectedOption) {
+    console.log(selectedOption);
     var selectedValue = selectedOption == null ? void 0 : selectedOption.value;
-    console.log(selectedValue, 'erf');
     if (selectedValue) {
       console.log(selectedValue);
       var url = getUrl(selectedValue);
       console.log('Generated URL:', url);
+      // You can navigate to the URL or handle it further here
       window.open(url, '_blank');
     }
   };
-  return React.createElement(DropDownContainer$1, {
-    ref: dropdownRef
-  }, React.createElement(DropDownItem, {
-    label: "PRINT",
-    icon: React.createElement(DropDownLarge, null),
-    onClick: handleClick
-  }), isOpen && React.createElement(DropDownMenu, {
+  return React.createElement(Container$13, null, React.createElement(SelectDropdown, {
+    placeholder: "PRINT",
     options: PrintMenu,
-    onSelect: handleSelectChange
+    value: "PRINT",
+    isSearchable: false,
+    onChange: handleSelectChange,
+    styles: _extends({}, dropdownStyles, filterDropdownStyles, {
+      container: function container(styles) {
+        return _extends({}, styles, {
+          cursor: 'pointer'
+        });
+      },
+      menu: function menu(styles) {
+        return _extends({}, styles, {
+          top: '113%',
+          borderRadius: '5px',
+          width: 'max-content',
+          cursor: 'pointer'
+        });
+      },
+      control: function control(styles) {
+        return _extends({}, styles, {
+          width: '90px',
+          boxShadow: 'none',
+          borderColor: 'transparent',
+          cursor: 'pointer',
+          backgroundColor: 'transparent',
+          '&:hover': {
+            boxShadow: 'none',
+            borderColor: 'transparent'
+          }
+        });
+      }
+    })
   }));
 }
+var Container$13 = /*#__PURE__*/styled.div(_templateObject$1L || (_templateObject$1L = /*#__PURE__*/_taggedTemplateLiteralLoose([""])));
 
-var _templateObject$1N;
+var _templateObject$1M;
 // components
 function DropDowns$1() {
-  return React.createElement(React.Fragment, null, React.createElement(DashBoardWrapper, null, React.createElement(MenuDropDown, null), React.createElement(OptionsDropDown, null), React.createElement(Print, null)));
+  return React.createElement(React.Fragment, null, React.createElement(DashBoardWrapper, null, React.createElement(BjsMenu, null), React.createElement(Options, null), React.createElement(Print, null)));
 }
-var DashBoardWrapper = /*#__PURE__*/styled.section(_templateObject$1N || (_templateObject$1N = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  padding: 0 5px;\n  display: flex;\n  align-content: center;\n  gap: 10px;\n"])));
+var DashBoardWrapper = /*#__PURE__*/styled.section(_templateObject$1M || (_templateObject$1M = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  padding: 0 5px;\n  display: flex;\n  align-self: center;\n  gap: 10px;\n"])));
 
-var _templateObject$1O;
+var _templateObject$1N;
 // import Actions from './actions/Actions';
 var ActionsMenu = function ActionsMenu() {
-  return React.createElement(Flex$3, null, React.createElement(DropDowns$1, null));
+  return React.createElement(Flex$2, null, React.createElement(DropDowns$1, null));
 };
-var Flex$3 = /*#__PURE__*/styled.div(_templateObject$1O || (_templateObject$1O = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);\n  display: flex;\n  height: 34px;\n  padding: 1px;\n  align-items: flex-start;\n  border-radius: 20px;\n  border: 1px solid rgba(0, 0, 0, 0.08);\n  background: #f0f2f2;\n  cursor: pointer;\n"])));
+var Flex$2 = /*#__PURE__*/styled.div(_templateObject$1N || (_templateObject$1N = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);\n  display: flex;\n  height: 34px;\n  padding: 1px;\n  align-items: flex-start;\n  border-radius: 20px;\n  border: 1px solid rgba(0, 0, 0, 0.08);\n  background: #f0f2f2;\n  cursor: pointer;\n"])));
 
-var _templateObject$1P;
+var _templateObject$1O;
 var DetailsFilters = function DetailsFilters() {
-  return React.createElement(Flex$4, null, React.createElement(Details, null), React.createElement(ActionsMenu, null));
+  return React.createElement(Flex$3, null, React.createElement(Details, null), React.createElement(ActionsMenu, null));
 };
-var Flex$4 = /*#__PURE__*/styled.div(_templateObject$1P || (_templateObject$1P = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  border-radius: 40px;\n  border: 1px solid rgba(0, 0, 0, 0.08);\n  background: linear-gradient(180deg, #fff 0%, #f9fcff 100%);\n\n  box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);\n  /* z-index: 9999; */\n  display: flex;\n  padding: 10px;\n  flex-direction: row;\n  gap: 10px;\n  align-self: stretch;\n  position: relative;\n  margin-bottom: -71px;\n  width: 97%;\n  margin-left: 21px;\n  top: -132px;\n  justify-content: space-between;\n"])));
+var Flex$3 = /*#__PURE__*/styled.div(_templateObject$1O || (_templateObject$1O = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  border-radius: 40px;\n  border: 1px solid rgba(0, 0, 0, 0.08);\n  background: linear-gradient(180deg, #fff 0%, #f9fcff 100%);\n\n  box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);\n  /* z-index: 9999; */\n  display: flex;\n  padding: 10px;\n  flex-direction: row;\n  gap: 10px;\n  align-self: stretch;\n  position: relative;\n  margin-bottom: -71px;\n  width: 97%;\n  margin-left: 21px;\n  top: -132px;\n  justify-content: space-between;\n"])));
 
-var _templateObject$1Q, _templateObject2$1n, _templateObject3$O, _templateObject4$s;
+var _templateObject$1P, _templateObject2$1n, _templateObject3$O, _templateObject4$s;
 function OrderView() {
   notification.config({
     top: 150
@@ -8446,13 +8453,6 @@ function OrderView() {
   var _useGsitOrderId = useGsitOrderId(),
     gsitOrderId = _useGsitOrderId[0],
     setGsitOrderId = _useGsitOrderId[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) {
-      return part !== '';
-    }); // Filter out empty parts
-    return parts;
-  };
   // For API Call
   var _useOrderDetails = useOrderDetails(),
     orderDetails = _useOrderDetails[0],
@@ -8469,12 +8469,8 @@ function OrderView() {
     setDepotOptions = _useDepotOptions[1];
   var _useCustomerInfo = useCustomerInfo(),
     setCustomerInfo = _useCustomerInfo[1];
-  var location = useLocation();
-  var paths = splitPath(location.pathname);
   var _useLocationOptions = useLocationOptions(),
     setLocationOptions = _useLocationOptions[1];
-  var _useApiCalling = useApiCalling(),
-    apiCalling = _useApiCalling[0];
   var _useOrderProductsReso = useOrderProductsResources(),
     orderResources = _useOrderProductsReso[0],
     setOrderResources = _useOrderProductsReso[1];
@@ -8493,30 +8489,83 @@ function OrderView() {
   var _useLiveRecalling = useLiveRecalling(),
     liveRecalling = _useLiveRecalling[0];
   var systemLogsData = useSystemLogs();
+  var _useAssignData = useAssignData(),
+    setAssignData = _useAssignData[1];
+  // query param
+  var location = useLocation();
+  var _useState2 = useState([]),
+    filters = _useState2[0],
+    setFilters = _useState2[1];
+  // for third party apps
   var _useApiHook = useApiHook({
-      endpoint: "orders/" + orderId,
+      endpoint: "orders/",
       method: 'GET',
+      filters: filters,
       performAction: false
     }),
-    fetchedData = _useApiHook.data,
-    loading = _useApiHook.loading,
-    orderUpdate = _useApiHook.setShouldPerformAction;
+    fetchedDataExternal = _useApiHook.data,
+    loadingExternal = _useApiHook.loading,
+    setShouldPerformExternal = _useApiHook.setShouldPerformAction;
+  useEffect(function () {
+    var searchParams = new URLSearchParams(location.search);
+    if (searchParams != null && searchParams.toString()) {
+      var dynamicFilters = [];
+      searchParams == null || searchParams.forEach(function (value, key) {
+        if (key === 'order') {
+          dynamicFilters.push({
+            field: 'gsit_order_id',
+            op: '=',
+            value: value
+          });
+        } else {
+          dynamicFilters.push({
+            field: key,
+            op: '=',
+            value: value
+          });
+        }
+      });
+      setFilters(dynamicFilters);
+      if (filters) {
+        var _fetchedDataExternal$;
+        setShouldPerformExternal(true);
+        setOrderId(fetchedDataExternal == null || (_fetchedDataExternal$ = fetchedDataExternal.data[0]) == null ? void 0 : _fetchedDataExternal$.id);
+      }
+    } else {
+      var paths = location.pathname.split('/');
+      setOrderId(paths[paths.length - 1]);
+    }
+  }, [location.search, loadingExternal]);
   var _useApiHook2 = useApiHook({
+      endpoint: "orders/" + orderId,
+      method: 'GET',
+      performAction: false
+    }),
+    fetchedData = _useApiHook2.data,
+    loading = _useApiHook2.loading,
+    orderUpdate = _useApiHook2.setShouldPerformAction;
+  useEffect(function () {
+    if (orderId) {
+      orderUpdate(true);
+      liveRecalling ? setLivePerformAction(false) : setLivePerformAction(true);
+    }
+  }, [orderId, liveRecalling]);
+  var _useApiHook3 = useApiHook({
       endpoint: "/orders/getStaticData/all/",
       method: 'GET'
     }),
-    fetchedStaticData = _useApiHook2.data,
-    staticDataLoading = _useApiHook2.loading;
+    fetchedStaticData = _useApiHook3.data,
+    staticDataLoading = _useApiHook3.loading;
   //Order status api
-  var _useApiHook3 = useApiHook({
+  var _useApiHook4 = useApiHook({
       endpoint: "/orders/get_live_status/" + orderId,
       method: 'GET',
       performAction: false
     }),
-    fetchedStatusData = _useApiHook3.data,
-    statusDataLoading = _useApiHook3.loading,
-    setLivePerformAction = _useApiHook3.setShouldPerformAction;
-  var _useApiHook4 = useApiHook({
+    fetchedStatusData = _useApiHook4.data,
+    statusDataLoading = _useApiHook4.loading,
+    setLivePerformAction = _useApiHook4.setShouldPerformAction;
+  var _useApiHook5 = useApiHook({
       endpoint: "/depot/",
       method: 'GET',
       filters: [{
@@ -8525,35 +8574,17 @@ function OrderView() {
         value: true
       }]
     }),
-    fetchedDepotData = _useApiHook4.data,
-    depotDataLoading = _useApiHook4.loading;
-  useEffect(function () {
-    if (orderId) {
-      orderUpdate(true);
-      liveRecalling ? setLivePerformAction(false) : setLivePerformAction(true);
-    }
-  }, [orderId, liveRecalling]);
-  useEffect(function () {
-    if (apiCalling) {
-      orderUpdate(true);
-    } else {
-      orderUpdate(false);
-    }
-  }, [apiCalling]);
-  useEffect(function () {
-    if (paths.length > 1) {
-      setOrderId(paths[2]);
-    }
-    // for local
-    // if (paths.length >= 0) {
-    //   setOrderId(paths[1]);
-    // }
-  }, [paths]);
+    fetchedDepotData = _useApiHook5.data,
+    depotDataLoading = _useApiHook5.loading;
   useEffect(function () {
     setLoading(staticDataLoading);
     if (fetchedStaticData && fetchedStaticData.data) {
+      var _fetchedStaticData$da;
       var result = fetchedStaticData == null ? void 0 : fetchedStaticData.data;
       setOrderStaticData(result[0]);
+      setAssignData(fetchedStaticData == null || (_fetchedStaticData$da = fetchedStaticData.data) == null ? void 0 : _fetchedStaticData$da.flatMap(function (i) {
+        return i == null ? void 0 : i.resource_visibility_type;
+      }));
     }
   }, [staticDataLoading]);
   useEffect(function () {
@@ -8585,7 +8616,7 @@ function OrderView() {
       }
     }
     return function () {
-      setOrderId(null);
+      // setOrderId(null);
     };
   }, [statusDataLoading, fetchedStatusData]);
   useEffect(function () {
@@ -8605,17 +8636,17 @@ function OrderView() {
       }
     }
     return function () {
-      setOrderId(null);
+      // setOrderId(null);
     };
   }, [depotDataLoading]);
   // Order resources
-  var _useApiHook5 = useApiHook({
+  var _useApiHook6 = useApiHook({
       endpoint: "/orders/" + orderId + "/order_resources/",
       method: 'GET',
       performAction: false
     }),
-    fetchedResourcesData = _useApiHook5.data,
-    setActions = _useApiHook5.setShouldPerformAction;
+    fetchedResourcesData = _useApiHook6.data,
+    setActions = _useApiHook6.setShouldPerformAction;
   useEffect(function () {
     if (orderId) {
       setActions(true);
@@ -8626,17 +8657,17 @@ function OrderView() {
       setOrderResources(fetchedResourcesData);
     }
     return function () {
-      setOrderId(null);
+      // setOrderId(null);
     };
   }, [fetchedResourcesData, orderResources, setOrderResources]);
   // Toolbox resources
-  var _useApiHook6 = useApiHook({
+  var _useApiHook7 = useApiHook({
       endpoint: "/orders/" + orderId + "/toolbox_resources/",
       method: 'GET',
       performAction: false
     }),
-    fetchedToolboxData = _useApiHook6.data,
-    setAction = _useApiHook6.setShouldPerformAction;
+    fetchedToolboxData = _useApiHook7.data,
+    setAction = _useApiHook7.setShouldPerformAction;
   useEffect(function () {
     if (orderId) {
       setAction(true);
@@ -8647,16 +8678,9 @@ function OrderView() {
       setOrderToolbox(fetchedToolboxData);
     }
     return function () {
-      setOrderId(undefined);
+      // setOrderId(undefined);
     };
   }, [fetchedToolboxData, orderToolbox, setOrderToolbox]);
-  useEffect(function () {
-    if (GsitCUstomerId != null && GsitCUstomerId.id) {
-      shouldFetch(true);
-    } else {
-      shouldFetch(false);
-    }
-  }, [GsitCUstomerId]);
   useEffect(function () {
     return function () {
       setGsitCUstomerId(function (prev) {
@@ -8666,14 +8690,21 @@ function OrderView() {
       });
     };
   }, []);
-  var _useApiHook7 = useApiHook({
+  var _useApiHook8 = useApiHook({
       endpoint: "/return_locations/?customer_id=" + (GsitCUstomerId == null ? void 0 : GsitCUstomerId.id),
       method: 'GET',
       performAction: false
     }),
-    fetchedLocationData = _useApiHook7.data,
-    dataLoading = _useApiHook7.loading,
-    shouldFetch = _useApiHook7.setShouldPerformAction;
+    fetchedLocationData = _useApiHook8.data,
+    dataLoading = _useApiHook8.loading,
+    shouldFetch = _useApiHook8.setShouldPerformAction;
+  useEffect(function () {
+    if (GsitCUstomerId != null && GsitCUstomerId.id) {
+      shouldFetch(true);
+    } else {
+      shouldFetch(false);
+    }
+  }, [GsitCUstomerId]);
   useEffect(function () {
     if (fetchedLocationData && fetchedLocationData != null && fetchedLocationData.data) {
       var _fetchedLocationData$;
@@ -8721,7 +8752,7 @@ function OrderView() {
   }, [gsitId]);
   return React.createElement(MainContainer$b, null, React.createElement(GeneralHeader, null), React.createElement(DetailsFilters, null), React.createElement(OrderDetails$1, null), React.createElement(ProductsInfo, null), React.createElement(SplitLayout$1, null, React.createElement(NotesContainer, null, React.createElement(Notes, null)), React.createElement(TablesContainer, null, React.createElement(SystemLogs, null))), React.createElement(OrderActions, null));
 }
-var MainContainer$b = /*#__PURE__*/styled.div(_templateObject$1Q || (_templateObject$1Q = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  gap: 10px;\n  padding-bottom: 30px;\n  border-radius: 25px;\n  border: 1px solid #e3e3e3;\n"])));
+var MainContainer$b = /*#__PURE__*/styled.div(_templateObject$1P || (_templateObject$1P = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  gap: 10px;\n  padding-bottom: 30px;\n"])));
 var SplitLayout$1 = /*#__PURE__*/styled.div(_templateObject2$1n || (_templateObject2$1n = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  gap: 15px;\n  @media (max-width: 1024px) {\n    display: contents;\n  }\n"])));
 var NotesContainer = /*#__PURE__*/styled.div(_templateObject3$O || (_templateObject3$O = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  flex: 1;\n"])));
 var TablesContainer = /*#__PURE__*/styled.div(_templateObject4$s || (_templateObject4$s = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  flex: 1;\n  display: flex;\n  flex-direction: column;\n  gap: 15px;\n"])));
@@ -8843,7 +8874,7 @@ var filtersReducerAtom = /*#__PURE__*/atom(function (get) {
   return set(filtersStateAtom, filterReducer(get(filtersStateAtom), action));
 });
 
-var _templateObject$1R;
+var _templateObject$1Q;
 function SelectionFilter() {
   var _useCustomerData = useCustomerData(),
     customers = _useCustomerData[0];
@@ -8982,7 +9013,7 @@ function SelectionFilter() {
       if (!currentSearch.includes('filter')) {
         console.log('inside include');
         // for dev
-        navigate("/order/return/filter?" + queryParams.toString());
+        navigate("/filter?" + queryParams.toString());
         // for local
         //navigate(`/filter?${queryParams.toString()}`);
       }
@@ -9151,7 +9182,7 @@ function SelectionFilter() {
     disabled: !isButtonEnabled
   }, "Apply"))));
 }
-var StyledAntSelect$2 = /*#__PURE__*/styled(Select)(_templateObject$1R || (_templateObject$1R = /*#__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 StyledAntSelect$2 = /*#__PURE__*/styled(Select)(_templateObject$1Q || (_templateObject$1Q = /*#__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"])));
 
 // import { ApiResponse } from '../../types';
 // import { useApiHook } from '@bjsdistribution/dms-component-library';
@@ -9215,9 +9246,9 @@ function HeaderFilter() {
   return React.createElement(CoverPage, null, React.createElement(SelectionFilter, null));
 }
 
-var _templateObject$1S, _templateObject4$t, _templateObject5$i, _templateObject7$c, _templateObject8$8;
+var _templateObject$1R, _templateObject4$t, _templateObject5$i, _templateObject7$c, _templateObject8$8;
 //Left side
-var LeftSideConatiner = /*#__PURE__*/styled.div(_templateObject$1S || (_templateObject$1S = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  padding: 1px 5px 1px 1.1px;\n  align-items: center;\n  gap: 10px;\n  border-radius: 40px;\n  border: 1px solid rgba(0, 0, 0, 0.08);\n  background: var(--Flowkit-White, #fff);\n\n  .filtercontainer {\n    display: flex;\n    padding: 8px 8px 8px 4px;\n    align-items: center;\n    gap: 4px;\n    align-self: stretch;\n    border-radius: 20px 0px 0px 20px;\n    border-right: 1px solid rgba(0, 0, 0, 0.04);\n    background: var(--BjsColor-Bg-F0F2F2, #f0f2f2);\n\n    .filtericon {\n      display: flex;\n      padding: 7px 0px 5px 5px;\n      align-items: flex-start;\n      gap: 10px;\n      border-radius: 30px;\n    }\n    .textcont {\n      color: #758588;\n      text-align: center;\n      font-size: 14px;\n      font-style: normal;\n      font-weight: 500;\n      line-height: normal;\n    }\n  }\n  .datefilter {\n    display: flex;\n    height: 36px;\n    padding: 6px 8px;\n    justify-content: center;\n    align-items: center;\n    gap: 2px;\n    border-radius: 20px;\n    border: 1px solid #edebe8;\n\n    .dateiconcontainer {\n      display: flex;\n      width: 24px;\n      height: 24px;\n      padding: 5px;\n      flex-direction: column;\n      justify-content: center;\n      align-items: center;\n      border-radius: 20px;\n      border: 1px solid var(--tonal-brown-101, #e2e0db);\n      background: #f1f5f6;\n    }\n    .datetext {\n      color: #6a7378;\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    }\n  }\n"])));
+var LeftSideConatiner = /*#__PURE__*/styled.div(_templateObject$1R || (_templateObject$1R = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  padding: 1px 5px 1px 1.1px;\n  align-items: center;\n  gap: 10px;\n  border-radius: 40px;\n  border: 1px solid rgba(0, 0, 0, 0.08);\n  background: var(--Flowkit-White, #fff);\n\n  .filtercontainer {\n    display: flex;\n    padding: 8px 8px 8px 4px;\n    align-items: center;\n    gap: 4px;\n    align-self: stretch;\n    border-radius: 20px 0px 0px 20px;\n    border-right: 1px solid rgba(0, 0, 0, 0.04);\n    background: var(--BjsColor-Bg-F0F2F2, #f0f2f2);\n\n    .filtericon {\n      display: flex;\n      padding: 7px 0px 5px 5px;\n      align-items: flex-start;\n      gap: 10px;\n      border-radius: 30px;\n    }\n    .textcont {\n      color: #758588;\n      text-align: center;\n      font-size: 14px;\n      font-style: normal;\n      font-weight: 500;\n      line-height: normal;\n    }\n  }\n  .datefilter {\n    display: flex;\n    height: 36px;\n    padding: 6px 8px;\n    justify-content: center;\n    align-items: center;\n    gap: 2px;\n    border-radius: 20px;\n    border: 1px solid #edebe8;\n\n    .dateiconcontainer {\n      display: flex;\n      width: 24px;\n      height: 24px;\n      padding: 5px;\n      flex-direction: column;\n      justify-content: center;\n      align-items: center;\n      border-radius: 20px;\n      border: 1px solid var(--tonal-brown-101, #e2e0db);\n      background: #f1f5f6;\n    }\n    .datetext {\n      color: #6a7378;\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    }\n  }\n"])));
 //
 var StyledFiter = /*#__PURE__*/styled.div(_templateObject4$t || (_templateObject4$t = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n"])));
 var StyledFIlterELements = /*#__PURE__*/styled.div(_templateObject5$i || (_templateObject5$i = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  padding: 0;\n  gap: 10px;\n  align-items: center;\n"])));
@@ -9225,7 +9256,7 @@ var Text$8 = /*#__PURE__*/styled.div(_templateObject7$c || (_templateObject7$c =
 // Right side filter
 var StyledTableFilter = /*#__PURE__*/styled.div(_templateObject8$8 || (_templateObject8$8 = /*#__PURE__*/_taggedTemplateLiteralLoose([""])));
 
-var _templateObject$1T, _templateObject2$1o;
+var _templateObject$1S, _templateObject2$1o;
 // import { StyledBulkItem } from '../../filters/BulkFilterStyle';
 // import SearchType from '../../header/route-header/search/SearchType';
 // import DownloadIcon from '../../../../assets/icons/DownloadIcon';
@@ -9234,7 +9265,7 @@ var RightFilters = function RightFilters() {
     dispatch = _useAtom[1];
   var _useSelectedOrders = useSelectedOrders(),
     selectedReturnOrder = _useSelectedOrders[0];
-  return React.createElement(Container$13, null, React.createElement(ButtonText, {
+  return React.createElement(Container$14, null, React.createElement(ButtonText, {
     onClick: function onClick() {
       return dispatch({
         type: 'create-return'
@@ -9243,7 +9274,7 @@ var RightFilters = function RightFilters() {
     disabled: (selectedReturnOrder == null ? void 0 : selectedReturnOrder.length) === 0
   }, "Create Return"));
 };
-var Container$13 = /*#__PURE__*/styled.div(_templateObject$1T || (_templateObject$1T = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  /* align-items: flex-start; */\n  gap: 16px;\n  align-items: center;\n"])));
+var Container$14 = /*#__PURE__*/styled.div(_templateObject$1S || (_templateObject$1S = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  /* align-items: flex-start; */\n  gap: 16px;\n  align-items: center;\n"])));
 // const Mid = styled.div`
 //   display: flex;
 //   padding: 4px 10px;
@@ -9268,8 +9299,8 @@ var ReturnFilter = function ReturnFilter() {
   return React.createElement(React.Fragment, null, React.createElement(StyledFiter, null, React.createElement(Text$8, null, customerName), React.createElement(StyledFIlterELements, null, React.createElement(StyledTableFilter, null)), React.createElement(RightFilters, null)));
 };
 
-var _templateObject$1U, _templateObject2$1p, _templateObject3$Q, _templateObject4$u, _templateObject34, _templateObject35, _templateObject36, _templateObject37;
-var ColumStyle = /*#__PURE__*/styled.div(_templateObject$1U || (_templateObject$1U = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  width: 67px;\n  align-items: center;\n  gap: 7px;\n"])));
+var _templateObject$1T, _templateObject2$1p, _templateObject3$Q, _templateObject4$u, _templateObject34, _templateObject35, _templateObject36, _templateObject37;
+var ColumStyle = /*#__PURE__*/styled.div(_templateObject$1T || (_templateObject$1T = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  width: 67px;\n  align-items: center;\n  gap: 7px;\n"])));
 var GreyBox = /*#__PURE__*/styled.div(_templateObject2$1p || (_templateObject2$1p = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  padding: 3px 12px;\n  align-items: flex-start;\n  gap: 24px;\n  border-radius: 6px;\n  background: rgba(153, 153, 153, 0.1);\n"])));
 // Styled components
 var StyledTableWrapper$2 = /*#__PURE__*/styled.div(_templateObject3$Q || (_templateObject3$Q = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  overflow-x: auto;\n  max-height: calc(100vh - 396px);\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"])));
@@ -9466,7 +9497,7 @@ var optionsForReturnPrint = [{
   label: 'Print Return Labels'
 }];
 
-var _templateObject$1V, _templateObject2$1q;
+var _templateObject$1U, _templateObject2$1q;
 var options = optionsForReturnPrint;
 var PrintDropDownReturn = function PrintDropDownReturn(_ref) {
   var legacyProductId = _ref.legacyProductId;
@@ -9482,7 +9513,7 @@ var PrintDropDownReturn = function PrintDropDownReturn(_ref) {
     }, IconComponent && React.createElement(IconComponent, null), " ", item.label);
   }));
 };
-var OptionsList = /*#__PURE__*/styled.ul(_templateObject$1V || (_templateObject$1V = /*#__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 OptionsList = /*#__PURE__*/styled.ul(_templateObject$1U || (_templateObject$1U = /*#__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$1q || (_templateObject2$1q = /*#__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"])));
 
 function CaretDownFilledIcon(props) {
@@ -9875,7 +9906,7 @@ var ReturnOrderTable = function ReturnOrderTable() {
   })))));
 };
 
-var _templateObject$1W, _templateObject2$1r;
+var _templateObject$1V, _templateObject2$1r;
 var DefectsModal = function DefectsModal() {
   var options = [{
     value: 'bjsCouriers',
@@ -9927,10 +9958,10 @@ var DefectsModal = function DefectsModal() {
     }
   }))));
 };
-var StyledConatiner = /*#__PURE__*/styled.div(_templateObject$1W || (_templateObject$1W = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  /* tex: nowrap; */\n"])));
+var StyledConatiner = /*#__PURE__*/styled.div(_templateObject$1V || (_templateObject$1V = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  /* tex: nowrap; */\n"])));
 var GLobalPopupContent = /*#__PURE__*/styled.div(_templateObject2$1r || (_templateObject2$1r = /*#__PURE__*/_taggedTemplateLiteralLoose([""])));
 
-var _templateObject$1X, _templateObject2$1s, _templateObject3$R;
+var _templateObject$1W, _templateObject2$1s, _templateObject3$R;
 var _excluded$4 = ["id"];
 var CreateReturnModal = function CreateReturnModal() {
   var _useSelectedConfirmLo = useSelectedConfirmLoc(),
@@ -9983,7 +10014,7 @@ var CreateReturnModal = function CreateReturnModal() {
     type: "info",
     title: "Do you wish to proceed?",
     showOkButton: false
-  }), React.createElement(Container$14, null, React.createElement("ul", {
+  }), React.createElement(Container$15, null, React.createElement("ul", {
     style: {
       listStyle: 'none',
       padding: 0
@@ -10009,8 +10040,8 @@ var CreateReturnModal = function CreateReturnModal() {
     }, displayValueOrNA(returnLoc == null || (_returnLoc$return_loc = returnLoc.return_locations) == null ? void 0 : _returnLoc$return_loc.location_name)));
   })))));
 };
-var StyledText$1 = /*#__PURE__*/styled.div(_templateObject$1X || (_templateObject$1X = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: #8d8f90;\n  font-family: Poppins;\n  font-size: 14px;\n  font-style: normal;\n  font-weight: 400;\n"])));
-var Container$14 = /*#__PURE__*/styled.div(_templateObject2$1s || (_templateObject2$1s = /*#__PURE__*/_taggedTemplateLiteralLoose([""])));
+var StyledText$1 = /*#__PURE__*/styled.div(_templateObject$1W || (_templateObject$1W = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: #8d8f90;\n  font-family: Poppins;\n  font-size: 14px;\n  font-style: normal;\n  font-weight: 400;\n"])));
+var Container$15 = /*#__PURE__*/styled.div(_templateObject2$1s || (_templateObject2$1s = /*#__PURE__*/_taggedTemplateLiteralLoose([""])));
 var Wrapper$l = /*#__PURE__*/styled.div(_templateObject3$R || (_templateObject3$R = /*#__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 ModalManager = function ModalManager() {
@@ -10114,7 +10145,7 @@ var ModalManager = function ModalManager() {
       // for local
       // navigate('/order-return');
       // for dev
-      navigate('/order/return/view');
+      navigate('/orders/view/return');
     }
   }, [postLoading]);
   return React.createElement(React.Fragment, null, (popupName == null ? void 0 : popupName.state) === 'create-return' && React.createElement(React.Fragment, null, React.createElement(AntModal, {
@@ -10160,8 +10191,8 @@ var ModalManager = function ModalManager() {
   }));
 };
 
-var _templateObject$1Y, _templateObject2$1t, _templateObject3$S, _templateObject4$v, _templateObject6$c, _templateObject7$d;
-var StyledContainer = /*#__PURE__*/styled.div(_templateObject$1Y || (_templateObject$1Y = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  align-self: stretch;\n  padding: 0;\n  max-width: 100%;\n  margin-top: 11px;\n  margin-bottom: 0;\n"])));
+var _templateObject$1X, _templateObject2$1t, _templateObject3$S, _templateObject4$v, _templateObject6$c, _templateObject7$d;
+var StyledContainer = /*#__PURE__*/styled.div(_templateObject$1X || (_templateObject$1X = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  align-self: stretch;\n  padding: 0;\n  max-width: 100%;\n  margin-top: 11px;\n  margin-bottom: 0;\n"])));
 var StyledContentWrapper = /*#__PURE__*/styled.div(_templateObject2$1t || (_templateObject2$1t = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  gap: 12px;\n"])));
 var StyledInfoBox = /*#__PURE__*/styled.div(_templateObject3$S || (_templateObject3$S = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  border-radius: 20px;\n  border: 1px solid #e2e0db;\n  background: #fff;\n  color: #8e8a85;\n  font-size: 14px;\n  font-weight: 400;\n  line-height: 20px;\n  letter-spacing: 0.07px;\n  padding: 6px 10px;\n"])));
 var StyledLabel$2 = /*#__PURE__*/styled.div(_templateObject4$v || (_templateObject4$v = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: #8e8a85;\n\n  font-size: 13px;\n  font-weight: 400;\n  line-height: 16px;\n  display: flex;\n  align-items: center;\n"])));
@@ -10284,7 +10315,7 @@ var Pagination = function Pagination(_ref) {
   }, React.createElement(NextIcon, null)))));
 };
 
-var _templateObject$1Z, _templateObject2$1u;
+var _templateObject$1Y, _templateObject2$1u;
 // import { useLocation } from 'react-router-dom';
 var ReturnTable = function ReturnTable() {
   var _UsePaginationData = UsePaginationData(),
@@ -10309,7 +10340,7 @@ var ReturnTable = function ReturnTable() {
   // }, [location]);
   return React.createElement("div", null, React.createElement(DashBoardWrapper$1, null, React.createElement("div", {
     className: "Tableconatiner"
-  }, React.createElement(HeaderFilter, null), React.createElement(Container$15, null, React.createElement(ReturnFilter, null), React.createElement(ReturnOrderTable, null), total > 0 && React.createElement(Pagination, {
+  }, React.createElement(HeaderFilter, null), React.createElement(Container$16, null, React.createElement(ReturnFilter, null), React.createElement(ReturnOrderTable, null), total > 0 && React.createElement(Pagination, {
     currentPage: page,
     totalItems: total,
     itemsPerPage: itemsPerPage,
@@ -10317,7 +10348,7 @@ var ReturnTable = function ReturnTable() {
     onItemsPerPageChange: handleItemsPerPageChange
   })))), React.createElement(ModalManager, null));
 };
-var Container$15 = /*#__PURE__*/styled.div(_templateObject$1Z || (_templateObject$1Z = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  position: relative;\n  top: -46px;\n"])));
+var Container$16 = /*#__PURE__*/styled.div(_templateObject$1Y || (_templateObject$1Y = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  position: relative;\n  top: -46px;\n"])));
 var DashBoardWrapper$1 = /*#__PURE__*/styled.section(_templateObject2$1u || (_templateObject2$1u = /*#__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"])));
 
 function LoadIcon() {
@@ -10336,7 +10367,7 @@ function LoadIcon() {
   }));
 }
 
-var _templateObject$1_, _templateObject2$1v;
+var _templateObject$1Z, _templateObject2$1v;
 var PrintDropDown = function PrintDropDown(_ref) {
   var legacyProductId = _ref.legacyProductId;
   var downloadFiles = function downloadFiles(type) {
@@ -10362,7 +10393,7 @@ var PrintDropDown = function PrintDropDown(_ref) {
     }, IconComponent && React.createElement(IconComponent, null), item.label);
   }));
 };
-var OptionsList$1 = /*#__PURE__*/styled.ul(_templateObject$1_ || (_templateObject$1_ = /*#__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: 34px;\n  right: 0;\n  z-index: 99;\n  min-width: 194px;\n"])));
+var OptionsList$1 = /*#__PURE__*/styled.ul(_templateObject$1Z || (_templateObject$1Z = /*#__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: 34px;\n  right: 0;\n  z-index: 99;\n  min-width: 194px;\n"])));
 var OptionsListLi$1 = /*#__PURE__*/styled.li(_templateObject2$1v || (_templateObject2$1v = /*#__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: ", ";\n  color: ", ";\n  &:last-child {\n    border: none;\n  }\n  &:hover {\n    background-color: ", ";\n  }\n"])), function (_ref2) {
   var disabled = _ref2.disabled;
   return disabled ? 'not-allowed' : 'pointer';
@@ -10374,7 +10405,7 @@ var OptionsListLi$1 = /*#__PURE__*/styled.li(_templateObject2$1v || (_templateOb
   return disabled ? 'transparent' : '#f0f0f0';
 });
 
-var _templateObject$1$;
+var _templateObject$1_;
 var OrderTable = function OrderTable(_ref) {
   var loadingskeleton = _ref.loadingskeleton;
   // const [, setSelectedReturnOrder] = useSelectedOrders();
@@ -10643,7 +10674,7 @@ var OrderTable = function OrderTable(_ref) {
         paddingLeft: 0
       }
     }, React.createElement(NavLink, {
-      to: "" + item.id
+      to: "/" + item.id
     }, displayValueOrNA(item == null || (_item$order_recipient = item.order_recipient) == null ? void 0 : _item$order_recipient.recipient_name))), React.createElement("li", {
       style: {
         color: '#888075'
@@ -10690,12 +10721,12 @@ var OrderTable = function OrderTable(_ref) {
     }, React.createElement(LoadIcon, null)))));
   })))));
 };
-var StyledAntSelect$3 = /*#__PURE__*/styled(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 StyledAntSelect$3 = /*#__PURE__*/styled(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$20;
+var _templateObject$1$;
 // import DownloadIcon from '../../../../assets/icons/DownloadIcon';
 var TableFilters = function TableFilters() {
-  return React.createElement(Container$16, null);
+  return React.createElement(Container$17, null);
   //   return (
   //     // <StyledBulkFilterCover>
   //       <StyledBulkItem>
@@ -10709,7 +10740,7 @@ var TableFilters = function TableFilters() {
   //     // </StyledBulkFilterCover>
   //   );
 };
-var Container$16 = /*#__PURE__*/styled.div(_templateObject$20 || (_templateObject$20 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  /* align-items: flex-start; */\n  gap: 16px;\n  align-items: center;\n"])));
+var Container$17 = /*#__PURE__*/styled.div(_templateObject$1$ || (_templateObject$1$ = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  /* align-items: flex-start; */\n  gap: 16px;\n  align-items: center;\n"])));
 
 var FilterIcon = function FilterIcon() {
   return React.createElement("svg", {
@@ -10942,7 +10973,7 @@ var filtersReducerReturnAtom = /*#__PURE__*/atom(function (get) {
   return set(filtersStateAtom$1, filterReducer$1(get(filtersStateAtom$1), action));
 });
 
-var _templateObject$21, _templateObject2$1w;
+var _templateObject$20, _templateObject2$1w;
 var ReturnOrderFilter = function ReturnOrderFilter() {
   var _useAtom = useAtom(filtersReducerReturnAtom),
     dispatch = _useAtom[1];
@@ -11157,7 +11188,7 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
     className: "cross"
   })), React.createElement(StyledFilterBtnLabel, null, "Clear all"))) : null)), React.createElement(TableFilters, null)));
 };
-var StyledDatePicker = /*#__PURE__*/styled.div(_templateObject$21 || (_templateObject$21 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  .custom-datepicker {\n    border: none;\n  }\n"])));
+var StyledDatePicker = /*#__PURE__*/styled.div(_templateObject$20 || (_templateObject$20 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  .custom-datepicker {\n    border: none;\n  }\n"])));
 // const DropdownContainer = styled.div``;
 var StyledAntSelect$4 = /*#__PURE__*/styled.div(_templateObject2$1w || (_templateObject2$1w = /*#__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"])));
 
@@ -11245,7 +11276,7 @@ var ReturnPagination = function ReturnPagination(_ref) {
   }, React.createElement(NextIcon, null)))));
 };
 
-var _templateObject$22, _templateObject2$1x;
+var _templateObject$21, _templateObject2$1x;
 var _excluded$5 = ["count"];
 var ReturnAfterTable = function ReturnAfterTable() {
   var _useReturnAfterOrderD = useReturnAfterOrderData(),
@@ -11308,7 +11339,7 @@ var ReturnAfterTable = function ReturnAfterTable() {
   }, [fetchedReturnOrderData, loading, returnAfterOrder]);
   return React.createElement("div", null, React.createElement(DashBoardWrapper$2, null, React.createElement("div", {
     className: "Tableconatiner"
-  }, React.createElement(Container$17, null, React.createElement(ReturnOrderFilter, null), React.createElement(OrderTable, null), total > 0 && React.createElement(ReturnPagination, {
+  }, React.createElement(Container$18, null, React.createElement(ReturnOrderFilter, null), React.createElement(OrderTable, null), total > 0 && React.createElement(ReturnPagination, {
     currentPage: page,
     totalItems: total,
     itemsPerPage: itemsPerPage,
@@ -11316,13 +11347,13 @@ var ReturnAfterTable = function ReturnAfterTable() {
     onItemsPerPageChange: handleItemsPerPageChange
   })))));
 };
-var Container$17 = /*#__PURE__*/styled.div(_templateObject$22 || (_templateObject$22 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  position: relative;\n  /* top: -30px; */\n"])));
+var Container$18 = /*#__PURE__*/styled.div(_templateObject$21 || (_templateObject$21 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  position: relative;\n  /* top: -30px; */\n"])));
 var DashBoardWrapper$2 = /*#__PURE__*/styled.section(_templateObject2$1x || (_templateObject2$1x = /*#__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$1y;
 var StyledBulkItem = /*#__PURE__*/styled.div(_templateObject2$1y || (_templateObject2$1y = /*#__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$23, _templateObject2$1z;
+var _templateObject$22, _templateObject2$1z;
 var SearchType = function SearchType() {
   var _useState = useState(''),
     searchText = _useState[0],
@@ -11337,7 +11368,7 @@ var SearchType = function SearchType() {
     onChange: handleInputChange
   }));
 };
-var Search = /*#__PURE__*/styled.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 Search = /*#__PURE__*/styled.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 SearchInput = /*#__PURE__*/styled.input(_templateObject2$1z || (_templateObject2$1z = /*#__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() {
@@ -11514,7 +11545,7 @@ var ReturnTable$1 = function ReturnTable() {
       customerId: customerId == null ? void 0 : customerId.toString()
     });
     //for dev
-    navigate("/order/return/filter?" + queryParams.toString());
+    navigate("/filter?" + queryParams.toString());
     //for local
     //navigate(`/filter?${queryParams.toString()}`);
   };
@@ -11540,7 +11571,7 @@ var ReturnTable$1 = function ReturnTable() {
       type: RTS
     });
     //for dev
-    navigate("/order/return/filter?" + queryParams.toString());
+    navigate("/filter?" + queryParams.toString());
     //for local
     //navigate(`/filter?${queryParams.toString()}`);
   };
@@ -11677,7 +11708,7 @@ var overviewfiltersReducerAtom = /*#__PURE__*/atom(function (get) {
   return set(filtersStateAtom$2, filterReducer$2(get(filtersStateAtom$2), action));
 });
 
-var _templateObject$24, _templateObject2$1A, _templateObject3$T;
+var _templateObject$23, _templateObject2$1A, _templateObject3$T;
 var _excluded$7 = ["count"];
 function ReturnMainTable() {
   var _useAtom = useAtom(overviewfiltersReducerAtom),
@@ -11739,7 +11770,7 @@ function ReturnMainTable() {
     className: " " + (isScrolled ? 'stickyTableHead' : '')
   }, React.createElement("div", {
     className: "Tableconatiner"
-  }, React.createElement(HeaderFilter, null), React.createElement(Container$18, null, React.createElement(Row$7, null, React.createElement(Text$8, null, "Client Return"), customerId ? React.createElement(ReturnFilter, null) : React.createElement(Filters, null)), React.createElement(ReturnTable$1, null)), total > 0 && React.createElement(Pagination, {
+  }, React.createElement(HeaderFilter, null), React.createElement(Container$19, null, React.createElement(Row$7, null, React.createElement(Text$8, null, "Client Return"), customerId ? React.createElement(ReturnFilter, null) : React.createElement(Filters, null)), React.createElement(ReturnTable$1, null)), total > 0 && React.createElement(Pagination, {
     currentPage: page,
     totalItems: total,
     itemsPerPage: itemsPerPage,
@@ -11747,25 +11778,25 @@ function ReturnMainTable() {
     onItemsPerPageChange: handleItemsPerPageChange
   }))));
 }
-var Row$7 = /*#__PURE__*/styled.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.div(_templateObject2$1A || (_templateObject2$1A = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  position: relative;\n  top: -46px;\n"])));
+var Row$7 = /*#__PURE__*/styled.div(_templateObject$23 || (_templateObject$23 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n"])));
+var Container$19 = /*#__PURE__*/styled.div(_templateObject2$1A || (_templateObject2$1A = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  position: relative;\n  top: -46px;\n"])));
 var DashBoardWrapper$3 = /*#__PURE__*/styled.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$25, _templateObject2$1B;
-var HeaderWrapper = /*#__PURE__*/styled.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 _templateObject$24, _templateObject2$1B;
+var HeaderWrapper = /*#__PURE__*/styled.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 StyledFlex = /*#__PURE__*/styled.div(_templateObject2$1B || (_templateObject2$1B = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: space-between;\n  width: 100%;\n"])));
 
-var _templateObject$26;
+var _templateObject$25;
 var HeaderTitle = function HeaderTitle(props) {
   return React.createElement(React.Fragment, null, React.createElement(Title$7, null, props.title));
 };
-var Title$7 = /*#__PURE__*/styled.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 Title$7 = /*#__PURE__*/styled.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 _templateObject$27, _templateObject2$1C;
+var _templateObject$26, _templateObject2$1C;
 function Breadcrumb(props) {
   return React.createElement(BreadcrumbContainer, null, React.createElement(BreadcrumbList, null, props.title || ''), React.createElement(BreadcrumbList, null, props.subtitle || ''), props.subPart && React.createElement(React.Fragment, null, React.createElement(BreadcrumbList, null, props.subPart)));
 }
-var BreadcrumbContainer = /*#__PURE__*/styled.div(_templateObject$27 || (_templateObject$27 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n"])));
+var BreadcrumbContainer = /*#__PURE__*/styled.div(_templateObject$26 || (_templateObject$26 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n"])));
 var BreadcrumbList = /*#__PURE__*/styled.span(_templateObject2$1C || (_templateObject2$1C = /*#__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) {
@@ -11824,7 +11855,7 @@ function ReturnClient() {
   };
   var paths = splitPath(location.pathname);
   useEffect(function () {
-    if (paths[paths.length - 1] === 'order/return') {
+    if (paths[paths.length - 1] === 'orders/view/return') {
       setActionTypeOptions([]);
       setLocationOptions([]);
       setSelectedClient(null);
@@ -11896,10 +11927,10 @@ function ReturnClient() {
     path: "",
     element: React.createElement(ReturnMainTable, null)
   }), React.createElement(Route, {
-    path: "view",
+    path: "overview",
     element: React.createElement(ReturnAfterTable, null)
   }), React.createElement(Route, {
-    path: "view/:id",
+    path: "/:id",
     element: React.createElement(OrderView, null)
   }), React.createElement(Route, {
     path: "filter",