@bjsdistribution/dms-client-return 0.0.70 → 0.0.71

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

@@ -62,7 +62,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;
@@ -2838,6 +2838,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',
@@ -2955,7 +2960,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'
@@ -3453,7 +3459,8 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
     placeholder: "Status of Order",
     onChange: handleStatusOfOrder,
     style: {
-      width: '145px'
+      minWidth: '150px',
+      width: 'auto'
     },
     value: statusOrder,
     onClear: handleClear,
@@ -3465,12 +3472,12 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
   }, React__default.createElement(ClientIcon, null)), React__default.createElement(StyledAntSelect$2, null, React__default.createElement(antd.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
@@ -3837,7 +3844,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:
@@ -4482,14 +4489,15 @@ function DeliveryDate() {
     }
   };
   return React__default.createElement(MainContainer$2, null, React__default.createElement(dmsComponentLibrary.Label, {
-    label: "Delivery Date"
+    label: "Delivery Date next"
   }), React__default.createElement(antd.DatePicker, {
     onChange: onChange,
     value: actionDate === null ? actionDate : dayjs(actionDate),
     format: "DD/MM/YY",
     style: {
       borderRadius: '25px'
-    }
+    },
+    allowClear: false
   }));
 }
 var MainContainer$2 = /*#__PURE__*/styled__default.div(_templateObject$C || (_templateObject$C = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  gap: 6px;\n  flex: 1;\n"])));
@@ -4809,7 +4817,7 @@ function ServiceTypeDropdown() {
     className:  'disabled' 
   }));
 }
-var Container$s = /*#__PURE__*/styled__default.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__default.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__default(dmsComponentLibrary.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;
@@ -4852,7 +4860,7 @@ function DeliveryPointDropdown() {
     className:  'disabled' 
   }));
 }
-var Container$t = /*#__PURE__*/styled__default.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__default.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__default(dmsComponentLibrary.SelectDropdown)(_templateObject2$D || (_templateObject2$D = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  &.disabled {\n    pointer-events: none;\n    opacity: 0.7;\n  }\n"])));
 
 var _templateObject$P;
@@ -5230,7 +5238,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) {
@@ -5338,7 +5346,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) {
@@ -5456,7 +5464,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) {
@@ -5959,7 +5967,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) {
@@ -6044,7 +6052,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) {
@@ -7907,6 +7915,7 @@ function DeliveryDate$1() {
   var today = new Date();
   var tomorrow = new Date(today);
   tomorrow.setDate(today.getDate() + 1);
+  //confirm popouop
   return React__default.createElement(Container$Z, null, React__default.createElement(Label$a, null, "Delivery Date"), React__default.createElement(antd.DatePicker, {
     onChange: handleDateChange,
     format: "DD/MM/YYYY",
@@ -7914,7 +7923,8 @@ function DeliveryDate$1() {
     style: {
       borderRadius: '15px'
     },
-    minDate: dayjs(tomorrow)
+    minDate: dayjs(tomorrow),
+    allowClear: false
   }));
 }
 var Label$a = /*#__PURE__*/styled__default.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"])));
@@ -8248,7 +8258,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) {
@@ -8324,14 +8334,7 @@ function ConfirmOrder() {
     onSubmit: ConfirmOrder,
     submitBtnTitle: "Save Details",
     isSubmitDisabled: errorFound()
-  }, React__default.createElement(ContentContainer$4, null, React__default.createElement(dmsComponentLibrary.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__default.createElement(Wrapper$j, null, React__default.createElement(CustomerInformation, null), React__default.createElement(SlotAndInstructions, null)), React__default.createElement(ProductTable$1, null), React__default.createElement(NotesTable, null)));
+  }, React__default.createElement(ContentContainer$4, null, React__default.createElement(Wrapper$j, null, React__default.createElement(CustomerInformation, null), React__default.createElement(SlotAndInstructions, null)), React__default.createElement(ProductTable$1, null), React__default.createElement(NotesTable, null)));
 }
 var Wrapper$j = /*#__PURE__*/styled__default.div(_templateObject$1I || (_templateObject$1I = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  gap: 10px;\n"])));
 var ContentContainer$4 = /*#__PURE__*/styled__default.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"])));
@@ -9095,7 +9098,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) {
@@ -9194,7 +9197,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) {
@@ -9264,7 +9267,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) {
@@ -9372,7 +9375,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) {
@@ -9445,7 +9448,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:
@@ -9766,7 +9769,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) {
@@ -9844,7 +9847,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) {
@@ -9994,7 +9997,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:
@@ -10044,7 +10047,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) {
@@ -10091,7 +10094,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) {
@@ -10183,7 +10186,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:
@@ -10359,7 +10362,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:
@@ -10466,7 +10469,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) {
@@ -10597,7 +10600,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) {
@@ -10781,7 +10784,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) {
@@ -11386,7 +11389,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) {
@@ -11908,7 +11911,7 @@ function ReturnClient() {
   };
   var paths = splitPath(location.pathname);
   React.useEffect(function () {
-    if (paths[paths.length - 1] === 'orders/view/return') {
+    if (paths.join('/') === 'orders/view/return') {
       setActionTypeOptions([]);
       setLocationOptions([]);
       setSelectedClient(null);
@@ -11916,11 +11919,6 @@ function ReturnClient() {
       setSelectedLocationValue(null);
     }
   }, [location.pathname, searchParams]);
-  // useEffect(() => {
-  //   if (selectedClientId) {
-  //     navigate(`filter/${selectedClientId}`);
-  //   }
-  // }, [selectedClientId]);
   //API for client data
   var _useApiHook = dmsComponentLibrary.useApiHook({
       endpoint: "/return_orders/customers/",