@bjsdistribution/dms-client-return 0.0.24 → 0.0.25

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

@@ -10001,6 +10001,8 @@ var ReturnOrderTable = function ReturnOrderTable() {
   var _useLoading = useLoading(),
     load = _useLoading[0],
     setLoading = _useLoading[1];
+  var _usePostLoading = usePostLoading(),
+    postLoading = _usePostLoading[0];
   var dropdownRefParent = useRef(null);
   var dropdownRef = useRef(null);
   var _usePrintOptionTOggle = usePrintOptionTOggle(),
@@ -10192,7 +10194,7 @@ var ReturnOrderTable = function ReturnOrderTable() {
     var mergedPayload = Object.values(groupedPayload);
     setGrouped(mergedPayload);
   }, [newpayload]);
-  return React.createElement(React.Fragment, null, React.createElement(StyledTableWrapper, {
+  return React.createElement(React.Fragment, null, postLoading && React.createElement(Loader, null), React.createElement(StyledTableWrapper, {
     className: "fortables"
   }, React.createElement(StyledTable$1, null, React.createElement("thead", null, React.createElement("tr", null, returnData != null && returnData.some(function (item) {
     var _item$order_product_r;
@@ -10987,8 +10989,6 @@ var CreateReturnModal = function CreateReturnModal() {
     setSelectedLocations = _useSelectedConfirmLo[1];
   var _useSelectedOrders = useSelectedOrders(),
     selectedReturnOrder = _useSelectedOrders[0];
-  var _usePostLoading = usePostLoading(),
-    load = _usePostLoading[0];
   var _useGroupedPayload = useGroupedPayload(),
     groupedPayload = _useGroupedPayload[0];
   var _useFinalPayload = useFinalPayload(),
@@ -11028,7 +11028,7 @@ var CreateReturnModal = function CreateReturnModal() {
       }
     }
   }, [selectedlocation]);
-  return React.createElement(React.Fragment, null, load && React.createElement(Loader, null), React.createElement(Wrapper$l, null, React.createElement(Alert, {
+  return React.createElement(React.Fragment, null, React.createElement(Wrapper$l, null, React.createElement(Alert, {
     onClose: function onClose() {},
     description: "",
     type: "info",
@@ -11089,6 +11089,7 @@ var ModalManager = function ModalManager() {
   var _useFinalPayload = useFinalPayload(),
     newGrouped = _useFinalPayload[0];
   var _usePostLoading = usePostLoading(),
+    postLoading = _usePostLoading[0],
     SetPostLoading = _usePostLoading[1];
   var _useSelectedOrders = useSelectedOrders(),
     setSelectedReturnOrder = _useSelectedOrders[1];
@@ -11191,6 +11192,7 @@ var ModalManager = function ModalManager() {
     if ((newGrouped == null ? void 0 : newGrouped.length) > 0) {
       setShouldPerformAction(true);
       setCallForFetch(true);
+      SetPostLoading(confirmLoading);
     }
     dispatch({
       type: 'close'
@@ -11257,12 +11259,10 @@ var ModalManager = function ModalManager() {
       setShouldPerformAction(false);
       setSelectAll(false);
       setError(null);
-      navigate('/order-return');
+      navigate('returnclient/order-return');
     }
-  }, [response, apiError]);
-  console.log(apiError, 'apiError apiError');
-  console.log(response, 'response response ');
-  return React.createElement(React.Fragment, null, (popupName == null ? void 0 : popupName.state) == 'create-return' && React.createElement(AntModal, {
+  }, [response, apiError, postLoading]);
+  return React.createElement(React.Fragment, null, (popupName == null ? void 0 : popupName.state) === 'create-return' && React.createElement(React.Fragment, null, React.createElement(AntModal, {
     openStatus: (popupName == null ? void 0 : popupName.state) == 'create-return' ? true : false,
     closeModal: function closeModal() {
       return _closeModal();
@@ -11284,7 +11284,7 @@ var ModalManager = function ModalManager() {
     BodyComponent: CreateReturnModal,
     width: 800,
     classNameAdd: 'globalPopup'
-  }), (popupName == null ? void 0 : popupName.state) === 'qclog' && React.createElement(AntModal, {
+  })), (popupName == null ? void 0 : popupName.state) === 'qclog' && React.createElement(AntModal, {
     openStatus: (popupName == null ? void 0 : popupName.state) === 'qclog',
     closeModal: _closeModal,
     PopupHeader: {