@bjsdistribution/dms-client-return 0.0.70 → 0.0.71

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

@@ -54,7 +54,7 @@ function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.includes(n)) continue;
+    if (e.indexOf(n) >= 0) continue;
     t[n] = r[n];
   }
   return t;
@@ -2830,6 +2830,11 @@ var OrderTable = function OrderTable() {
           color: '#845ADF',
           background: 'rgba(132, 90, 223, 0.15)'
         };
+      case 'Awaiting':
+        return {
+          color: '#845ADF',
+          background: 'rgba(132, 90, 223, 0.15)'
+        };
       case 'Completed':
         return {
           color: '#1F9254',
@@ -2947,7 +2952,8 @@ var OrderTable = function OrderTable() {
       cancelled: 'Cancelled',
       OO: 'On Hold',
       SC: 'Sub-Contracted',
-      'awaiting route': 'Awaiting route',
+      'awaiting route': 'Awaiting',
+      'awaiting confirmation': 'Awaiting',
       completed: 'completed',
       outstanding: 'Outstanding',
       routed: 'Routed'
@@ -3445,7 +3451,8 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
     placeholder: "Status of Order",
     onChange: handleStatusOfOrder,
     style: {
-      width: '145px'
+      minWidth: '150px',
+      width: 'auto'
     },
     value: statusOrder,
     onClear: handleClear,
@@ -3457,12 +3464,12 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
   }, React.createElement(ClientIcon, null)), React.createElement(StyledAntSelect$2, null, React.createElement(Select, {
     options: clientOptions,
     className: "custom-select",
-    placeholder: "Client",
+    placeholder: "Clients",
     onChange: handleClientChange,
     value: selectedClient,
     style: {
-      width: '125px',
-      border: 'none'
+      minWidth: '150px',
+      width: 'auto'
     },
     allowClear: true,
     onClear: handleClearClient
@@ -3829,7 +3836,7 @@ function SpokePhoneIcon() {
 
 function useCopyToClipboard() {
   var copy = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(text) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(text) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -4474,14 +4481,15 @@ function DeliveryDate() {
     }
   };
   return React.createElement(MainContainer$2, null, React.createElement(Label$h, {
-    label: "Delivery Date"
+    label: "Delivery Date next"
   }), React.createElement(DatePicker, {
     onChange: onChange,
     value: actionDate === null ? actionDate : dayjs(actionDate),
     format: "DD/MM/YY",
     style: {
       borderRadius: '25px'
-    }
+    },
+    allowClear: false
   }));
 }
 var MainContainer$2 = /*#__PURE__*/styled.div(_templateObject$C || (_templateObject$C = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  gap: 6px;\n  flex: 1;\n"])));
@@ -4801,7 +4809,7 @@ function ServiceTypeDropdown() {
     className:  'disabled' 
   }));
 }
-var Container$s = /*#__PURE__*/styled.div(_templateObject$N || (_templateObject$N = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  gap: 6px;\n  flex: 1;\n"])));
+var Container$s = /*#__PURE__*/styled.div(_templateObject$N || (_templateObject$N = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  gap: 6px;\n  // flex: 1;\n  min-width: 250px;\n"])));
 var StyledSelectDropdown$1 = /*#__PURE__*/styled(SelectDropdown)(_templateObject2$C || (_templateObject2$C = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  &.disabled {\n    cursor: not-allowed !important;\n    opacity: 0.7;\n  }\n"])));
 
 var _templateObject$O, _templateObject2$D;
@@ -4844,7 +4852,7 @@ function DeliveryPointDropdown() {
     className:  'disabled' 
   }));
 }
-var Container$t = /*#__PURE__*/styled.div(_templateObject$O || (_templateObject$O = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  gap: 6px;\n  flex: 1;\n"])));
+var Container$t = /*#__PURE__*/styled.div(_templateObject$O || (_templateObject$O = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  gap: 6px;\n  // flex: 1;\n  min-width: 250px;\n"])));
 var StyledSelectDropdown$2 = /*#__PURE__*/styled(SelectDropdown)(_templateObject2$D || (_templateObject2$D = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  &.disabled {\n    pointer-events: none;\n    opacity: 0.7;\n  }\n"])));
 
 var _templateObject$P;
@@ -5222,7 +5230,7 @@ function useUpdateOrder() {
   var _useUpdateApiCall = useUpdateApiCall(),
     setCallApi = _useUpdateApiCall[1]; //single detail
   var update = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
       var endpoint, signal, requestOptions, response, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -5330,7 +5338,7 @@ function OrderDetailsFooter() {
     return !isSame;
   };
   var onSave = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _response$data;
       var payload, response, _response$data$, _response$data$2;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -5448,7 +5456,7 @@ function AddNote() {
     notificationData = _useState2[0],
     setNotificationData = _useState2[1];
   var saveNote = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var endpoint, payload, response;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -5951,7 +5959,7 @@ var tableColumns = [{
 function useGetEventNotes() {
   var ssoToken = getCookie('id_token');
   var perform = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var endpoint, headers, response, _detail$, _json, detail, msg, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -6036,7 +6044,7 @@ function SystemLogs() {
     setNotesData = _useEventNotesData[1];
   // const gsitId = orderDetails?.gsit_order_id;
   var fetchReminderData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -7899,6 +7907,7 @@ function DeliveryDate$1() {
   var today = new Date();
   var tomorrow = new Date(today);
   tomorrow.setDate(today.getDate() + 1);
+  //confirm popouop
   return React.createElement(Container$Z, null, React.createElement(Label$a, null, "Delivery Date"), React.createElement(DatePicker, {
     onChange: handleDateChange,
     format: "DD/MM/YYYY",
@@ -7906,7 +7915,8 @@ function DeliveryDate$1() {
     style: {
       borderRadius: '15px'
     },
-    minDate: dayjs(tomorrow)
+    minDate: dayjs(tomorrow),
+    allowClear: false
   }));
 }
 var Label$a = /*#__PURE__*/styled.label(_templateObject$1A || (_templateObject$1A = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: #6a7378;\n  font-family: 'Lato', sans-serif;\n  font-size: 14px;\n  font-style: normal;\n  font-weight: 500;\n"])));
@@ -8240,7 +8250,7 @@ function ConfirmOrder() {
     return Object.keys(obj).length === 1 && obj.hasOwnProperty('id');
   }
   var ConfirmOrder = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var keysToRemovefromOrders, filteredOrderDetails, filteredPrevOrderDetails, payload, notUpdateOrder, _response$data, _response, formattedDate;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -8316,14 +8326,7 @@ function ConfirmOrder() {
     onSubmit: ConfirmOrder,
     submitBtnTitle: "Save Details",
     isSubmitDisabled: errorFound()
-  }, React.createElement(ContentContainer$4, null, React.createElement(Alert, {
-    description: "",
-    onClose: function onClose() {},
-    type: "info",
-    title: "There is Orders with identical postcodes that are yet to be delivered.View Orders",
-    showOkButton: false,
-    showCloseIcon: false
-  }), React.createElement(Wrapper$j, null, React.createElement(CustomerInformation, null), React.createElement(SlotAndInstructions, null)), React.createElement(ProductTable$1, null), React.createElement(NotesTable, null)));
+  }, React.createElement(ContentContainer$4, null, React.createElement(Wrapper$j, null, React.createElement(CustomerInformation, null), React.createElement(SlotAndInstructions, null)), React.createElement(ProductTable$1, null), React.createElement(NotesTable, null)));
 }
 var Wrapper$j = /*#__PURE__*/styled.div(_templateObject$1I || (_templateObject$1I = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  gap: 10px;\n"])));
 var ContentContainer$4 = /*#__PURE__*/styled.div(_templateObject2$1k || (_templateObject2$1k = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  /* display: flex; */\n  padding: 15px 12px;\n  flex: 1 0 0;\n  border-radius: 15px;\n  background: white;\n  display: flex;\n  flex-direction: column;\n  gap: 15px;\n  overflow: auto;\n  min-height: 500px;\n  overflow-x: hidden;\n  max-height: 500px;\n  scrollbar-width: thin;\n"])));
@@ -9087,7 +9090,7 @@ function useFetchSingleReminderData() {
     setLoading = _useFlagsLoading[1];
   var ssoToken = getCookie('id_token');
   var res = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var endpoint, headers, response, _detail$, _json, detail, msg, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -9186,7 +9189,7 @@ function useUpdateReminder() {
   var _useFlagsLoading = useFlagsLoading(),
     setLoading = _useFlagsLoading[1];
   var update = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
       var endpoint, requestOptions, response, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -9256,7 +9259,7 @@ function useFetchReminders() {
   var _useOrderDetails = useOrderDetails(),
     OrderData = _useOrderDetails[0];
   var perform = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var endpoint, headers, response, _detail$, _json, detail, msg, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -9364,7 +9367,7 @@ var ViewReminderModal = function ViewReminderModal() {
     setCurrentAction(undefined);
   };
   var fetchReminderData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -9437,7 +9440,7 @@ var ViewReminderModal = function ViewReminderModal() {
     }));
   };
   var handleEditReminder = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -9758,7 +9761,7 @@ function useCreateReminder() {
   var _useFlagsLoading = useFlagsLoading(),
     setLoading = _useFlagsLoading[1];
   var create = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
       var endpoint, requestOptions, response, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -9836,7 +9839,7 @@ function useFetchUnresolvedTasks() {
   var _useOrderDetails = useOrderDetails(),
     OrderData = _useOrderDetails[0];
   var perform = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var endpoint, headers, response, _detail$, _json, detail, msg, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -9986,7 +9989,7 @@ function TaskReminderModal() {
     setReminderPayload(initialValue);
   };
   var handleReminderSubmit = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -10036,7 +10039,7 @@ function OrderLock() {
     setCurrentAction(undefined);
   };
   var onComplete = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var isLocked, payload, response;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -10083,7 +10086,7 @@ function useUpdateFlag() {
   var _useFlagsLoading = useFlagsLoading(),
     setLoading = _useFlagsLoading[1];
   var create = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
       var endpoint, requestOptions, response, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -10175,7 +10178,7 @@ function HeaderSection() {
     setIsModalOpen(false);
   };
   var saveButton = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -10351,7 +10354,7 @@ function ActionSection() {
     setLoading = _useFlagsLoading[1];
   var updateFlag = useUpdateFlag();
   var onSubmit = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -10458,7 +10461,7 @@ function useFetchSingleFlagsData() {
   var ssoToken = getCookie('id_token');
   console.log(loading, 'loading loading');
   var res = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var endpoint, headers, response, _detail$, _json, detail, msg, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -10589,7 +10592,7 @@ function ViewFlag() {
     }
   }, [staticData]);
   var fetchAndSetSingleFlagData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -10773,7 +10776,7 @@ function useSystemLogs() {
   var _useOrderProductSyste = useOrderProductSystemLogs(),
     setSystemLogsEvents = _useOrderProductSyste[1];
   var perform = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var endpoint, headers, response, _detail$, _json, detail, msg, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -11378,7 +11381,7 @@ function OrderView() {
   var _useOrderProductSyste = useOrderProductSystemLogs(),
     setSystemLogsEvents = _useOrderProductSyste[1];
   var fetchReminderData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -11900,7 +11903,7 @@ function ReturnClient() {
   };
   var paths = splitPath(location.pathname);
   useEffect(function () {
-    if (paths[paths.length - 1] === 'orders/view/return') {
+    if (paths.join('/') === 'orders/view/return') {
       setActionTypeOptions([]);
       setLocationOptions([]);
       setSelectedClient(null);
@@ -11908,11 +11911,6 @@ function ReturnClient() {
       setSelectedLocationValue(null);
     }
   }, [location.pathname, searchParams]);
-  // useEffect(() => {
-  //   if (selectedClientId) {
-  //     navigate(`filter/${selectedClientId}`);
-  //   }
-  // }, [selectedClientId]);
   //API for client data
   var _useApiHook = useApiHook({
       endpoint: "/return_orders/customers/",