@bjsdistribution/dms-client-return 0.1.22-prod → 0.1.23-prod

package/dist/components/order-view/order-actions/actions/send-sms/SendSmsModal.d.ts

@@ -1,3 +1,4 @@
 import React from 'react';
 declare function SendSmsModal(): React.JSX.Element;
+export declare const ContentContainer: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;
 export default SendSmsModal;

package/dist/components/store.d.ts

@@ -62,5 +62,6 @@ declare function useSelectedProducts(): [any, (args_0: any) => void];
 export declare function useSelectedData(): [any, (args_0: any) => void];
 export declare function useNewReturnOrderData(): [any, (args_0: any) => void];
 declare function useClientPortal(): [boolean | undefined, (args_0: boolean | ((prev: boolean | undefined) => boolean | undefined) | undefined) => void];
+declare function useClientLoading(): [boolean, (args_0: boolean | ((prev: boolean) => boolean)) => void];
 export declare const useActiveCardId: () => [number, (args_0: number | ((prev: number) => number)) => void];
-export { useAtom, useFilter, useStaticData, useRowCollectedCount, useRowDeliveredCount, useReminderData, useInQueueData, useEmailInvoice, useCustomerData, useActionType, useLocationData, useSelectedOrders, useReturnPayload, useNewReturnPayload, useGroupedPayload, useStatusOrderData, useSelectedConfirmLoc, useSelectAll, usePostLoading, useFinalPayload, useClearState, useAssignData, useAssignPayload, useCallApiAgain, useActionTypeOptions, useLocationOptions, useSelectedProducts, useVisibilityData, useClientPortal, useSelectedClientPortOrders, useStartDate, useEndDate, useSelectedClientAfterOrders, };
+export { useAtom, useFilter, useStaticData, useRowCollectedCount, useRowDeliveredCount, useReminderData, useInQueueData, useEmailInvoice, useCustomerData, useActionType, useLocationData, useSelectedOrders, useReturnPayload, useNewReturnPayload, useGroupedPayload, useStatusOrderData, useSelectedConfirmLoc, useSelectAll, usePostLoading, useFinalPayload, useClearState, useAssignData, useAssignPayload, useCallApiAgain, useActionTypeOptions, useLocationOptions, useSelectedProducts, useVisibilityData, useClientPortal, useSelectedClientPortOrders, useStartDate, useEndDate, useSelectedClientAfterOrders, useClientLoading, };

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

@@ -18,6 +18,7 @@ var dayjs = _interopDefault(require('dayjs'));
 var reactTable = require('@tanstack/react-table');
 var Scrollbars = _interopDefault(require('react-custom-scrollbars-2'));
 var reactDom = require('react-dom');
+var TextArea = _interopDefault(require('antd/es/input/TextArea'));
 require('tippy.js/dist/tippy.css');
 var Tippy = _interopDefault(require('@tippyjs/react'));
 require('react-datepicker/dist/react-datepicker.css');
@@ -562,10 +563,15 @@ function useSelectedData() {
 function useNewReturnOrderData() {
   return jotai.useAtom(newReturnOrderData);
 }
+//call
 var isClientPortalAtom = /*#__PURE__*/jotai.atom(undefined);
 function useClientPortal() {
   return jotai.useAtom(isClientPortalAtom);
 }
+var isClientLoading = /*#__PURE__*/jotai.atom(true);
+function useClientLoading() {
+  return jotai.useAtom(isClientLoading);
+}
 var activeCardIdAtom = /*#__PURE__*/jotai.atom(1);
 var useActiveCardId = function useActiveCardId() {
   return jotai.useAtom(activeCardIdAtom);
@@ -1206,6 +1212,8 @@ function SelectionFilter() {
   var _useClientPortal = useClientPortal(),
     clientPortal = _useClientPortal[0];
   var navigate = reactRouterDom.useNavigate();
+  var _useClientLoading = useClientLoading(),
+    clientLoading = _useClientLoading[0];
   //API for client data
   var _useAxios = dmsComponentLibrary.useAxios({
       endpoint: "/v1/return/product/customers/",
@@ -1218,11 +1226,12 @@ function SelectionFilter() {
     fetchedCustomerData = _useAxios.data,
     loading = _useAxios.loading,
     fetchData = _useAxios.fetchData;
+  //need to fix
   React.useEffect(function () {
-    if (!clientPortal) {
+    if (!clientPortal && !clientLoading) {
       fetchData();
     }
-  }, []);
+  }, [clientLoading]);
   React.useEffect(function () {
     if (fetchedCustomerData && fetchedCustomerData != null && fetchedCustomerData.data) {
       setCustomers(fetchedCustomerData == null ? void 0 : fetchedCustomerData.data);
@@ -1529,19 +1538,33 @@ var overviewFilterReducer = function overviewFilterReducer(state, action) {
           startDate = _action$payload.startDate,
           endDate = _action$payload.endDate;
         var filters = [];
-        if (startDate) {
+        if (startDate && !endDate) {
+          var nextDay = dayjs(startDate).add(1, 'day').format('YYYY-MM-DD');
           filters.push({
             field: 'created_at',
             op: '>=',
             value: startDate + "T00:00:00+00:00"
           });
-        }
-        if (endDate) {
           filters.push({
             field: 'created_at',
             op: '<=',
-            value: endDate + "T23:59:59+00:00"
+            value: nextDay + "T00:00:00+00:00"
           });
+        } else {
+          if (startDate) {
+            filters.push({
+              field: 'created_at',
+              op: '>=',
+              value: startDate + "T00:00:00+00:00"
+            });
+          }
+          if (endDate) {
+            filters.push({
+              field: 'created_at',
+              op: '<=',
+              value: endDate + "T23:59:59+00:00"
+            });
+          }
         }
         return _extends({}, state, {
           'x-filters': [].concat(state['x-filters'].filter(function (f) {
@@ -4997,12 +5020,15 @@ function ContactHome() {
       hrefPrefix = '+44';
     }
     var finalHref = "tel:" + hrefPrefix + numberPart;
-    return React__default.createElement("a", {
+    return React__default.createElement(antd.Tooltip, {
+      placement: "top",
+      title: React__default.createElement("span", null, "Zoom")
+    }, React__default.createElement("a", {
       href: finalHref,
       style: {
         cursor: 'pointer'
       }
-    }, React__default.createElement(CallCustomer, null));
+    }, React__default.createElement(CallCustomer, null)));
   }()), errors.homeContactError && React__default.createElement(ErrorText$1, null, errors.homeContactError));
 }
 var InputContainer = /*#__PURE__*/styled__default.div(_templateObject$q || (_templateObject$q = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  gap: 7px;\n  align-items: center;\n"])));
@@ -5020,6 +5046,8 @@ function ContactWork() {
   var _useOrderDetails = useOrderDetails(),
     orderDetails = _useOrderDetails[0],
     setOrderDetails = _useOrderDetails[1];
+  var _useClientPortal = useClientPortal(),
+    isClientPortal = _useClientPortal[0];
   var orderRecipient = orderDetails == null ? void 0 : orderDetails.order_recipient;
   var _usePrevOrderDetails = usePrevOrderDetails(),
     prevOrderDetails = _usePrevOrderDetails[0];
@@ -5075,7 +5103,10 @@ function ContactWork() {
     placeholder: "Work Number",
     onKeyDown: handleKeyDown,
     value: (orderRecipient == null ? void 0 : orderRecipient.contact_work) || '',
-    onChange: onChange
+    onChange: onChange,
+    // minLength={10}
+    // maxLength={10}
+    disabled: isClientPortal
   }), apiContactWork && function () {
     var rawNumber = apiContactWork.replace(/\s+/g, '');
     var formattedNumber = rawNumber.replace(/\D/g, '');
@@ -5111,12 +5142,15 @@ function ContactWork() {
       hrefPrefix = '+44';
     }
     var finalHref = "tel:" + hrefPrefix + numberPart;
-    return React__default.createElement("a", {
+    return React__default.createElement(antd.Tooltip, {
+      placement: "top",
+      title: React__default.createElement("span", null, "Zoom")
+    }, React__default.createElement("a", {
       href: finalHref,
       style: {
         cursor: 'pointer'
       }
-    }, React__default.createElement(CallCustomer, null));
+    }, React__default.createElement(CallCustomer, null)));
   }()), errors.workCOntanctError && React__default.createElement(ErrorText$2, null, errors.workCOntanctError));
 }
 var InputContainer$1 = /*#__PURE__*/styled__default.div(_templateObject$r || (_templateObject$r = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  gap: 7px;\n  align-items: center;\n"])));
@@ -5233,12 +5267,15 @@ function ContactMobile() {
       hrefPrefix = '+44';
     }
     var finalHref = "tel:" + hrefPrefix + numberPart;
-    return React__default.createElement("a", {
+    return React__default.createElement(antd.Tooltip, {
+      placement: "top",
+      title: React__default.createElement("span", null, "Zoom")
+    }, React__default.createElement("a", {
       href: finalHref,
       style: {
         cursor: 'pointer'
       }
-    }, React__default.createElement(CallCustomer, null));
+    }, React__default.createElement(CallCustomer, null)));
   }()), errors.mobileError && React__default.createElement(ErrorText$3, null, errors.mobileError));
 }
 var InputContainer$2 = /*#__PURE__*/styled__default.div(_templateObject$s || (_templateObject$s = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  gap: 7px;\n  align-items: center;\n"])));
@@ -9888,22 +9925,20 @@ var HoldDatePickerWrap = /*#__PURE__*/styled__default.div(_templateObject18$1 ||
 var DatePickerWrap = /*#__PURE__*/styled__default.div(_templateObject19$1 || (_templateObject19$1 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  position: relative;\n\n  border-radius: 66px;\n  border: 1px solid #e0e2e7;\n  box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);\n\n  input[type='text'] {\n    border-radius: 20px;\n    background: #fff;\n    border: none;\n    color: #6a7378;\n    font-size: 14px;\n    font-weight: 400;\n    line-height: 18px;\n    padding: 10px 0;\n    padding-left: 33px;\n    min-width: 18vw;\n    &:focus-visible {\n      outline: none;\n    }\n  }\n  svg {\n    position: absolute;\n    right: 10px;\n    top: 50%;\n    transform: translateY(-50%);\n  }\n  .react-datepicker-wrapper {\n    background-color: white;\n    border-radius: 66px;\n  }\n  .ant-picker-outlined {\n    border-style: none;\n    border-radius: 66px;\n    outline: none;\n    width: 100%;\n  }\n"])));
 
 var _templateObject$1F, _templateObject2$1h;
-var CustomTextArea$3 = /*#__PURE__*/styled__default(dmsComponentLibrary.TextArea)(_templateObject$1F || (_templateObject$1F = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  width: 700px;\n  height: 140px;\n  resize: none;\n"])));
-var ErrorText$9 = /*#__PURE__*/styled__default.div(_templateObject2$1h || (_templateObject2$1h = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: red;\n  font-size: 12px;\n  margin-top: 4px;\n"])));
 function SendSmsModal() {
-  var _orderDetails$order_r, _formData$to$trim;
+  var _orderDetails$order_r, _orderDetails$order_r2, _orderDetails$order_r3, _formData$to$trim;
   var _useCurrentAction = useCurrentAction(),
     setCurrentAction = _useCurrentAction[1];
   var _useOrderDetails = useOrderDetails(),
     orderDetails = _useOrderDetails[0];
   var _useOrderId = useOrderId(),
     orderId = _useOrderId[0];
-  var initialTo = (orderDetails == null || (_orderDetails$order_r = orderDetails.order_recipient) == null ? void 0 : _orderDetails$order_r.contact_home) || '';
+  var VALID_UK_MOBILE_REGEX = /^(07\d{8,12}|447\d{7,11})$/;
   var _useState = React.useState(''),
     toError = _useState[0],
     setToError = _useState[1];
   var _useState2 = React.useState({
-      to: initialTo,
+      to: [orderDetails == null || (_orderDetails$order_r = orderDetails.order_recipient) == null ? void 0 : _orderDetails$order_r.contact_mobile, orderDetails == null || (_orderDetails$order_r2 = orderDetails.order_recipient) == null ? void 0 : _orderDetails$order_r2.contact_home, orderDetails == null || (_orderDetails$order_r3 = orderDetails.order_recipient) == null ? void 0 : _orderDetails$order_r3.contact_work].filter(Boolean).join(', '),
       body: ''
     }),
     formData = _useState2[0],
@@ -9919,17 +9954,21 @@ function SendSmsModal() {
       name = _e$target.name,
       value = _e$target.value;
     if (name === 'to') {
-      var digitsOnly = value.replace(/\D/g, '');
-      var error = '';
-      if (digitsOnly.length < 10) {
-        error = 'Phone number must be exactly 10 digits';
-      } else if (digitsOnly.length > 10) {
-        error = 'Phone number cannot exceed 10 digits';
+      var rawValue = value;
+      var numbers = rawValue.split(',').map(function (num) {
+        return num.trim();
+      });
+      var invalids = numbers.filter(function (num) {
+        return !VALID_UK_MOBILE_REGEX.test(num);
+      });
+      if (invalids.length === numbers.length) {
+        setToError('Enter at least one valid UK mobile number.');
+      } else {
+        setToError('');
       }
-      setToError(error);
       setFormData(function (prev) {
         return _extends({}, prev, {
-          to: digitsOnly.slice(0, 10)
+          to: rawValue
         });
       });
     } else {
@@ -9941,50 +9980,86 @@ function SendSmsModal() {
   };
   var handleSubmit = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _formData$to, _formData$body;
-      var trimmedTo, trimmedBody, payload;
+      var _formData$body;
+      var trimmedBody, rawContacts, validContacts, _iterator, _step, number, payload, response, _err$response, _err$response2, err, errMsg;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            trimmedTo = formData == null || (_formData$to = formData.to) == null ? void 0 : _formData$to.trim();
             trimmedBody = formData == null || (_formData$body = formData.body) == null ? void 0 : _formData$body.trim();
-            if (!(trimmedTo.length !== 10)) {
-              _context.next = 5;
+            if (trimmedBody) {
+              _context.next = 3;
               break;
             }
-            setToError('Phone number must be exactly 10 digits');
             return _context.abrupt("return");
-          case 5:
-            payload = {
-              order_id: +orderId,
-              receiver: trimmedTo,
-              message: trimmedBody,
-              notification_type: 'Send SMS'
-            };
-            if (!(!trimmedTo || !trimmedBody)) {
+          case 3:
+            rawContacts = formData.to.split(',').map(function (num) {
+              return num.trim();
+            });
+            validContacts = rawContacts.filter(function (num) {
+              return VALID_UK_MOBILE_REGEX.test(num);
+            });
+            if (!(validContacts.length === 0)) {
               _context.next = 8;
               break;
             }
+            antd.notification.warning({
+              message: 'No Valid UK Mobile Numbers',
+              description: 'Please provide at least one valid UK mobile number (e.g., 07123...).'
+            });
             return _context.abrupt("return");
           case 8:
             _context.prev = 8;
-            _context.next = 11;
+            _iterator = _createForOfIteratorHelperLoose(validContacts);
+          case 10:
+            if ((_step = _iterator()).done) {
+              _context.next = 19;
+              break;
+            }
+            number = _step.value;
+            payload = {
+              order_id: +orderId,
+              receiver: number,
+              message: trimmedBody,
+              notification_type: 'Send SMS'
+            };
+            _context.next = 15;
             return callSendSms({
               payload: payload
             });
-          case 11:
+          case 15:
+            response = _context.sent;
+            if (response.code === 200) {
+              antd.notification.success({
+                message: 'SMS Sent',
+                description: "Message sent to " + number
+              });
+            } else {
+              antd.notification.error({
+                message: 'SMS Failed',
+                description: "Failed to send to " + number + ": " + ((response == null ? void 0 : response.error) || 'Unknown error')
+              });
+            }
+          case 17:
+            _context.next = 10;
+            break;
+          case 19:
             closeModal();
-            _context.next = 17;
+            _context.next = 27;
             break;
-          case 14:
-            _context.prev = 14;
+          case 22:
+            _context.prev = 22;
             _context.t0 = _context["catch"](8);
-            console.error('Error sending SMS:', _context.t0);
-          case 17:
+            err = _context.t0;
+            errMsg = (err == null || (_err$response = err.response) == null || (_err$response = _err$response.data) == null ? void 0 : _err$response.error) || (err == null || (_err$response2 = err.response) == null || (_err$response2 = _err$response2.data) == null ? void 0 : _err$response2.message) || (err == null ? void 0 : err.message) || 'An unexpected error occurred.';
+            antd.notification.error({
+              message: 'Request Failed',
+              description: errMsg
+            });
+          case 27:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[8, 14]]);
+      }, _callee, null, [[8, 22]]);
     }));
     return function handleSubmit() {
       return _ref.apply(this, arguments);
@@ -9993,29 +10068,45 @@ function SendSmsModal() {
   var closeModal = function closeModal() {
     setCurrentAction(undefined);
   };
-  var isFormValid = (formData == null || (_formData$to$trim = formData.to.trim()) == null ? void 0 : _formData$to$trim.length) === 10 && !toError && (formData == null ? void 0 : formData.body.trim().length) > 0;
+  var isFormValid = (formData == null || (_formData$to$trim = formData.to.trim()) == null ? void 0 : _formData$to$trim.length) > 0 && !toError && (formData == null ? void 0 : formData.body.trim().length) > 0;
   return React__default.createElement(OrderActionModal, {
     headerTitle: "Send SMS",
     onCloseHeader: closeModal,
     onSubmit: handleSubmit,
     submitBtnTitle: loading ? 'Sending...' : 'Send SMS',
     isSubmitDisabled: !isFormValid || loading
-  }, React__default.createElement(ContentContainer$4, null, React__default.createElement(Label$c, null, "To"), React__default.createElement(StyledInput, {
+  }, React__default.createElement(ContentContainer$5, null, React__default.createElement(Label$c, null, "To"), React__default.createElement(StyledInput, {
     type: "text",
     name: "to",
     value: formData.to,
     onChange: handleInputChange,
     required: true,
-    placeholder: "Enter the number",
-    maxLength: 10
-  }), toError && React__default.createElement(ErrorText$9, null, toError), React__default.createElement(Label$c, null, "Body"), React__default.createElement(CustomTextArea$3, {
+    placeholder: "Enter the number"
+  }), toError && React__default.createElement(ErrorText$9, null, toError), React__default.createElement(Label$c, null, "Body"), React__default.createElement(TextArea, {
+    style: {
+      width: '700px',
+      height: '140px',
+      resize: 'none'
+    },
     name: "body",
     value: formData.body,
     onChange: handleInputChange,
     required: true,
-    placeholder: "Write here..."
+    placeholder: "Write here...",
+    maxLength: 500,
+    count: {
+      show: true,
+      max: 500
+    }
   })));
 }
+var ContentContainer$5 = /*#__PURE__*/styled__default.div(_templateObject$1F || (_templateObject$1F = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  padding: 20px;\n  flex-direction: column;\n  justify-content: center;\n  align-items: flex-start;\n  gap: 15px;\n  flex: 1 0 0;\n  border-radius: 15px;\n"])));
+// const CustomTextArea = styled(TextArea)`
+//   width: 700px;
+//   height: 140px;
+//   resize: none;
+// `;
+var ErrorText$9 = /*#__PURE__*/styled__default.div(_templateObject2$1h || (_templateObject2$1h = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: red;\n  font-size: 12px;\n  margin-top: 4px;\n"])));
 
 function SendEmailModal() {
   var _orderDetails$order_r;
@@ -12154,7 +12245,7 @@ function UncancelOrder(props) {
       display: 'flex',
       flexDirection: 'row'
     }
-  }, React__default.createElement(Label$c, null, "Un-cancel Note"), ' ', React__default.createElement(RequiredAsterisk$3, null, "*")), React__default.createElement(CustomTextArea$4, {
+  }, React__default.createElement(Label$c, null, "Un-cancel Note"), ' ', React__default.createElement(RequiredAsterisk$3, null, "*")), React__default.createElement(CustomTextArea$3, {
     rows: 5,
     onChange: onChange
   }))), React__default.createElement(UnCancelOrderTable, null)));
@@ -12162,7 +12253,7 @@ function UncancelOrder(props) {
 var RequiredAsterisk$3 = /*#__PURE__*/styled__default.span(_templateObject$1U || (_templateObject$1U = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: red;\n  margin-left: 2px;\n  font-size: x-small;\n"])));
 var Container$14 = /*#__PURE__*/styled__default.div(_templateObject2$1t || (_templateObject2$1t = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: space-between;\n  padding: 15px;\n  gap: 30px;\n  border-radius: 16px;\n  border: 1px solid#edebe8;\n  background: #f8fafc;\n\n  .uncancelReasonDropdown {\n    flex: 1;\n  }\n"])));
 var MainContainer$8 = /*#__PURE__*/styled__default.div(_templateObject3$Q || (_templateObject3$Q = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  padding: 20px;\n  gap: 10px;\n"])));
-var CustomTextArea$4 = /*#__PURE__*/styled__default(dmsComponentLibrary.TextArea)(_templateObject4$t || (_templateObject4$t = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  width: 346px;\n"])));
+var CustomTextArea$3 = /*#__PURE__*/styled__default(dmsComponentLibrary.TextArea)(_templateObject4$t || (_templateObject4$t = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  width: 346px;\n"])));
 
 var _templateObject$1V;
 function RemoveFromRoute(props) {
@@ -12252,7 +12343,7 @@ var Wrapper$i = /*#__PURE__*/styled__default.div(_templateObject$1W || (_templat
 var SplitContainer = /*#__PURE__*/styled__default.div(_templateObject3$R || (_templateObject3$R = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  /* width: 95%; */\n  min-width: 25vw;\n  display: flex;\n  flex-direction: column;\n  gap: 10px;\n"])));
 var StyledAntSelect$7 = /*#__PURE__*/styled__default(antd.Select)(_templateObject4$u || (_templateObject4$u = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  .ant-select-selector {\n    /* width: 22vw; */\n    border-radius: 22px;\n  }\n"])));
 var Label$d = /*#__PURE__*/styled__default.label(_templateObject5$k || (_templateObject5$k = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: #6a7378;\n  font-family: 'Lato', sans-serif;\n  font-size: 14px;\n  font-weight: 500;\n"])));
-var ContentContainer$5 = /*#__PURE__*/styled__default.div(_templateObject7$a || (_templateObject7$a = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  padding: 12px 12px;\n  margin: 5px 14px;\n  flex-direction: column;\n  justify-content: center;\n  align-items: flex-start;\n  gap: 15px;\n  background: #f8fafc;\n  border-radius: 15px;\n"])));
+var ContentContainer$6 = /*#__PURE__*/styled__default.div(_templateObject7$a || (_templateObject7$a = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  padding: 12px 12px;\n  margin: 5px 14px;\n  flex-direction: column;\n  justify-content: center;\n  align-items: flex-start;\n  gap: 15px;\n  background: #f8fafc;\n  border-radius: 15px;\n"])));
 var Row$6 = /*#__PURE__*/styled__default.div(_templateObject8$8 || (_templateObject8$8 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  gap: 10px;\n"])));
 var DoubleDropdownContainer = /*#__PURE__*/styled__default.div(_templateObject9$7 || (_templateObject9$7 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  gap: 10px;\n  width: 100%;\n"])));
 var FormRow = function FormRow(_ref) {
@@ -12886,7 +12977,7 @@ function ReminderModal(props) {
     submitBtnTitle: 'Save Reminder',
     isSubmitDisabled: isSubmitDisabled(),
     footerActions: ''
-  }, React__default.createElement(ContentContainer$5, null, React__default.createElement(CreateReminderModal, null))));
+  }, React__default.createElement(ContentContainer$6, null, React__default.createElement(CreateReminderModal, null))));
 }
 var OrderModal = /*#__PURE__*/styled__default(OrderActionModal)(_templateObject$1_ || (_templateObject$1_ = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  width: 70%;\n"])));
 
@@ -15173,7 +15264,7 @@ function ForceDebriefModal(props) {
     headerActions: React__default.createElement(ForceDebriefSelector, {
       onSwitchChange: handleSwitchChange
     })
-  }, React__default.createElement(MainContainer$b, null, React__default.createElement(FDNotification, null), React__default.createElement(ContentContainer$6, null, React__default.createElement(OrderInfo$1, null)), React__default.createElement(ContentContainer$6, null, React__default.createElement(Container$1h, null, React__default.createElement(dmsComponentLibrary.Label, {
+  }, React__default.createElement(MainContainer$b, null, React__default.createElement(FDNotification, null), React__default.createElement(ContentContainer$7, null, React__default.createElement(OrderInfo$1, null)), React__default.createElement(ContentContainer$7, null, React__default.createElement(Container$1h, null, React__default.createElement(dmsComponentLibrary.Label, {
     label: "Delivery Instructions",
     htmlFor: "deliveryInstruction"
   }), React__default.createElement(Text$c, null, (orderDetails == null ? void 0 : orderDetails.delivery_instructions) || 'N/A')), React__default.createElement(Container$1h, null, React__default.createElement(dmsComponentLibrary.Label, {
@@ -15184,7 +15275,7 @@ function ForceDebriefModal(props) {
     return React__default.createElement(ProductContainer, {
       key: index
     }, React__default.createElement(Status$1, null, '*'), React__default.createElement(Status$1, null, (item == null ? void 0 : item.status_value) || 'N/A'), React__default.createElement(Status$1, null, (item == null || (_item$order_product_t = item.order_product_type) == null ? void 0 : _item$order_product_t.type) || 'N/A'), React__default.createElement(Status$1, null, (item == null ? void 0 : item.sku) || 'N/A'), React__default.createElement(Status$1, null, "Part 1 of 1"), React__default.createElement(Status$1, null, 'Weight' + ':' + (item == null ? void 0 : item.weight) || 'N/A'), React__default.createElement(Status$1, null, 'Cube' + ':' + (item == null ? void 0 : item.cube) || 'N/A'));
-  }))), React__default.createElement(ContentContainer$6, null, React__default.createElement(ContainerInner, null, React__default.createElement(BaseCharges, {
+  }))), React__default.createElement(ContentContainer$7, null, React__default.createElement(ContainerInner, null, React__default.createElement(BaseCharges, {
     inputValue: inputValue,
     setInputValue: setInputValue,
     staticData: staticData
@@ -15200,7 +15291,7 @@ function ForceDebriefModal(props) {
   })), React__default.createElement(OrderCharges, {
     inputValue: inputValue,
     setInputValue: setInputValue
-  }), React__default.createElement(AdhocSection, null)), activeTab === 'failure' && React__default.createElement(ContentContainer$6, {
+  }), React__default.createElement(AdhocSection, null)), activeTab === 'failure' && React__default.createElement(ContentContainer$7, {
     style: {
       flexDirection: 'column',
       gap: '10px'
@@ -15226,7 +15317,7 @@ var MainContainer$b = /*#__PURE__*/styled__default.div(_templateObject3$12 || (_
 var ContainerInner = /*#__PURE__*/styled__default.div(_templateObject4$C || (_templateObject4$C = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n"])));
 var Container$1h = /*#__PURE__*/styled__default.div(_templateObject5$s || (_templateObject5$s = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  width: 100%;\n"])));
 var Text$c = /*#__PURE__*/styled__default.div(_templateObject6$e || (_templateObject6$e = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: #363a30;\n  font-size: 14px;\n  white-space: break-spaces;\n"])));
-var ContentContainer$6 = /*#__PURE__*/styled__default.div(_templateObject7$f || (_templateObject7$f = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  padding: 12px;\n  flex-direction: row;\n  align-items: flex-start;\n  gap: 40px;\n  flex: 1 0 0;\n  border-radius: 15px;\n  background: #f8fafc;\n  width: 100%;\n  white-space: nowrap;\n"])));
+var ContentContainer$7 = /*#__PURE__*/styled__default.div(_templateObject7$f || (_templateObject7$f = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  padding: 12px;\n  flex-direction: row;\n  align-items: flex-start;\n  gap: 40px;\n  flex: 1 0 0;\n  border-radius: 15px;\n  background: #f8fafc;\n  width: 100%;\n  white-space: nowrap;\n"])));
 var ProductDiv = /*#__PURE__*/styled__default.div(_templateObject8$b || (_templateObject8$b = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  padding: 12px;\n  flex-direction: row;\n  align-items: flex-start;\n  gap: 40px;\n  flex: 1 0 0;\n  border-radius: 15px;\n  background: #f8fafc;\n  width: 100%;\n  white-space: nowrap;\n  min-height: 60px;\n  overflow: scroll;\n  max-height: 150px;\n"])));
 var ForceDebriefModal$1 = /*#__PURE__*/React__default.memo(ForceDebriefModal);
 
@@ -15843,29 +15934,65 @@ var StyledSpace$2 = /*#__PURE__*/styled__default(antd.Space)(_templateObject$2q
 var _templateObject$2r, _templateObject2$1N;
 // components
 function DropDowns$1() {
-  var _orderDetails$order_r, _orderDetails$order_r2;
+  var _orderDetails$order_r, _orderDetails$order_r2, _orderDetails$order_r3, _orderDetails$order_r4;
   var _useOrderDetails = useOrderDetails(),
     orderDetails = _useOrderDetails[0];
   var _useCurrentAction = useCurrentAction(),
     setCurrentAction = _useCurrentAction[1];
+  var _useAtom = jotai.useAtom(errorAtom),
+    errors = _useAtom[0];
+  var _useState = React.useState(false),
+    hasNotifiedMobile = _useState[0],
+    setHasNotifiedMobile = _useState[1];
+  var _useState2 = React.useState(false),
+    hasNotifiedEmail = _useState2[0],
+    setHasNotifiedEmail = _useState2[1];
   var isEmailId = orderDetails == null || (_orderDetails$order_r = orderDetails.order_recipient) == null ? void 0 : _orderDetails$order_r.contact_email;
-  var isContactNum = orderDetails == null || (_orderDetails$order_r2 = orderDetails.order_recipient) == null ? void 0 : _orderDetails$order_r2.contact_home;
+  // const isContactNum = orderDetails?.order_recipient?.contact_home;
+  var VALID_UK_MOBILE_REGEX = /^(07\d{8,12}|447\d{7,11})$/;
+  var VALID_IRISH_MOBILE_REGEX = /^(08[35679]\d{7}|3538[35679]\d{7}|\+3538[35679]\d{7})$/;
+  var isValidUKMobile = function isValidUKMobile(number) {
+    return typeof number === 'string' && VALID_UK_MOBILE_REGEX.test(number);
+  };
+  var isValidIrishMobile = function isValidIrishMobile(number) {
+    return typeof number === 'string' && VALID_IRISH_MOBILE_REGEX.test(number);
+  };
+  var isValidMobile = function isValidMobile(number) {
+    return isValidUKMobile(number) || isValidIrishMobile(number);
+  };
+  var contactMobile = orderDetails == null || (_orderDetails$order_r2 = orderDetails.order_recipient) == null ? void 0 : _orderDetails$order_r2.contact_mobile;
+  var contactHome = orderDetails == null || (_orderDetails$order_r3 = orderDetails.order_recipient) == null ? void 0 : _orderDetails$order_r3.contact_home;
+  var contactWork = orderDetails == null || (_orderDetails$order_r4 = orderDetails.order_recipient) == null ? void 0 : _orderDetails$order_r4.contact_work;
+  var allContacts = [contactMobile, contactHome, contactWork];
+  var hasValidMobile = allContacts.some(isValidMobile);
   var actions = [];
-  if (isContactNum) {
-    actions == null || actions.push({
-      label: 'Send SMS',
-      onClick: function onClick() {
-        return setCurrentAction('send-sms');
+  if (hasValidMobile) {
+    if (errors != null && errors.mobileError) {
+      if (!hasNotifiedMobile) {
+        setHasNotifiedMobile(true);
       }
-    });
+    } else {
+      actions.push({
+        label: 'Send SMS',
+        onClick: function onClick() {
+          return setCurrentAction('send-sms');
+        }
+      });
+    }
   }
   if (isEmailId) {
-    actions == null || actions.push({
-      label: 'Send Email',
-      onClick: function onClick() {
-        return setCurrentAction('send-email');
+    if (errors != null && errors.emailError) {
+      if (!hasNotifiedEmail) {
+        setHasNotifiedEmail(true);
       }
-    });
+    } else {
+      actions.push({
+        label: 'Send Email',
+        onClick: function onClick() {
+          return setCurrentAction('send-email');
+        }
+      });
+    }
   }
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(DashBoardWrapper$2, null, React__default.createElement(BjsMenuDropDown, null), React__default.createElement(Options$1, null), React__default.createElement(Print, null), actions == null ? void 0 : actions.map(function (action, index) {
     return React__default.createElement(FontContainer, {
@@ -17717,6 +17844,8 @@ function ReturnMainTable() {
   var queryParams = new URLSearchParams(location.search);
   var _useClientPortal = useClientPortal(),
     clientPortal = _useClientPortal[0];
+  var _useClientLoading = useClientLoading(),
+    clientLoading = _useClientLoading[0];
   var customerId = queryParams.get('customerId');
   var handlePageChange = function handlePageChange(page) {
     setCurrentPage(page);
@@ -17738,10 +17867,10 @@ function ReturnMainTable() {
     loading = _useAxios.loading,
     fetchData = _useAxios.fetchData;
   React.useEffect(function () {
-    if (!clientPortal) {
+    if (!clientPortal && !clientLoading) {
       fetchData();
     }
-  }, []);
+  }, [clientLoading]);
   React.useEffect(function () {
     if (fetchedCustomerData && fetchedCustomerData != null && fetchedCustomerData.data) {
       setCustomers(fetchedCustomerData == null ? void 0 : fetchedCustomerData.data);
@@ -17760,10 +17889,10 @@ function ReturnMainTable() {
     paginationData = _useAxios2.paginationData,
     fetchProductStats = _useAxios2.fetchData;
   React.useEffect(function () {
-    if (!clientPortal) {
+    if (!clientPortal && !clientLoading) {
       fetchProductStats();
     }
-  }, []);
+  }, [clientLoading]);
   React.useEffect(function () {
     setLoading(statsDataLoading);
     if (fetchedClientData && fetchedClientData.data) {
@@ -18770,7 +18899,19 @@ var ClientRouterHeader = function ClientRouterHeader(_ref) {
     }
   }, [startDate, endDate]);
   var handleStartDateChange = function handleStartDateChange(date) {
-    setStartDate(date != null ? date : null);
+    if (!date) {
+      setStartDate(null);
+      setEndDate(null);
+      dispatch({
+        type: 'SET_CP_DATE_FILTER',
+        payload: {
+          startDate: null,
+          endDate: null
+        }
+      });
+    } else {
+      setStartDate(date);
+    }
   };
   var handleEndDateChange = function handleEndDateChange(date) {
     setEndDate(date);
@@ -18788,7 +18929,7 @@ var ClientRouterHeader = function ClientRouterHeader(_ref) {
     value: startDate ? dayjs(startDate) : null,
     onChange: handleStartDateChange,
     format: 'MMMM D, YYYY',
-    allowClear: false,
+    allowClear: true,
     disabledDate: function disabledDate(current) {
       return !!endDate && current.isAfter(dayjs(endDate), 'day');
     }
@@ -18858,6 +18999,7 @@ var RouterHeader = function RouterHeader(_ref) {
 };
 
 function ReturnClient() {
+  var _localStorage$getItem;
   antd.notification.config({
     top: 80
   });
@@ -18892,9 +19034,12 @@ function ReturnClient() {
     clientPortal = _useClientPortal[0],
     setClientPortal = _useClientPortal[1];
   var location = reactRouterDom.useLocation();
-  var userType = JSON.parse(localStorage.getItem('user_type'));
+  var userType = JSON.parse((_localStorage$getItem = localStorage.getItem('user_type')) != null ? _localStorage$getItem : 'null');
+  var _useClientLoading = useClientLoading(),
+    setLoading = _useClientLoading[1];
   React.useEffect(function () {
-    setClientPortal((userType == null ? void 0 : userType.is_customer) || false); // change it to false bydefault
+    setClientPortal(userType != null && userType.is_customer ? true : false); // change it to false bydefault
+    setLoading(false);
   }, []);
   var splitPath = function splitPath(str) {
     var _str$split;