@bjsdistribution/dms-client-return 0.1.28-prod → 0.1.29-prod

package/dist/components/order-view/types.d.ts

@@ -119,7 +119,7 @@ export interface OrdersType {
     vehicle_type: string | null;
     order_recipient: OrderRecipientType | null;
     order_services_detail: OrderServicesDetailType | null;
-    order_services: OrderServiceType[];
+    order_services?: OrderServiceType[];
     order_routes?: OrderRouteType | null;
     order_eta_updates: any[];
     order_delivery_declined_dates: any[];

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

@@ -6136,14 +6136,31 @@ function OrderDetailsFooter() {
     isClientPortal = _useClientPortal[0];
   var _useLiveRecalling = useLiveRecalling(),
     setRecalling = _useLiveRecalling[1];
-  //update order
+  var _useOrderAlertsData = useOrderAlertsData(),
+    setOrderAlertsData = _useOrderAlertsData[1];
+  var _useStatusDetails = useStatusDetails(),
+    setOrderStatus = _useStatusDetails[1];
+  // call alerts api
   var _useAxios = dmsComponentLibrary.useAxios({
+      endpoint: "v1/orders/alerts/?order_id=" + (orderDetails == null ? void 0 : orderDetails.id),
+      method: 'GET'
+    }),
+    callOrderAlertsApi = _useAxios.fetchData;
+  //Order status api
+  var _useAxios2 = dmsComponentLibrary.useAxios({
+      endpoint: "/orders/get_live_status/" + (orderDetails == null ? void 0 : orderDetails.id),
+      method: 'GET'
+    }),
+    callOrderStatusApi = _useAxios2.fetchData;
+  //update order
+  var _useAxios3 = dmsComponentLibrary.useAxios({
       endpoint: "/orders/update/",
       method: 'PUT'
     }),
-    callUpdateOrderAPI = _useAxios.fetchData;
+    callUpdateOrderAPI = _useAxios3.fetchData;
   var errorFound = function errorFound() {
-    var isError = errorState.w3wError.length > 0 || errorState.emailError.length > 0 || errorState.homeContactError.length > 0 || errorState.workCOntanctError.length > 0 || errorState.mobileError.length > 0 || errorState.postCodeError.length > 0;
+    var _errorState$w3wError, _errorState$emailErro, _errorState$homeConta, _errorState$workCOnta, _errorState$mobileErr, _errorState$postCodeE;
+    var isError = (errorState == null || (_errorState$w3wError = errorState.w3wError) == null ? void 0 : _errorState$w3wError.length) > 0 || (errorState == null || (_errorState$emailErro = errorState.emailError) == null ? void 0 : _errorState$emailErro.length) > 0 || (errorState == null || (_errorState$homeConta = errorState.homeContactError) == null ? void 0 : _errorState$homeConta.length) > 0 || (errorState == null || (_errorState$workCOnta = errorState.workCOntanctError) == null ? void 0 : _errorState$workCOnta.length) > 0 || (errorState == null || (_errorState$mobileErr = errorState.mobileError) == null ? void 0 : _errorState$mobileErr.length) > 0 || (errorState == null || (_errorState$postCodeE = errorState.postCodeError) == null ? void 0 : _errorState$postCodeE.length) > 0;
     return isError;
   };
   var isDifferent = function isDifferent() {
@@ -6158,7 +6175,7 @@ function OrderDetailsFooter() {
   var onSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _response$data;
-      var payload, serviceKeys, orderServicesPayload, includesKey, _iterator, _step, key, response, _response$data$, _response$data$2;
+      var payload, serviceKeys, _i, _serviceKeys, key, response, _response$data$, _response$data$2, alertsApiRes, orderStatusApiRes;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -6167,28 +6184,22 @@ function OrderDetailsFooter() {
             setRecalling(false);
             payload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
             serviceKeys = ['assemble', 'disassemble', 'unpack_items', 'collect_disposal', 'take_packaging_away', 'assembly_type'];
-            orderServicesPayload = {};
-            includesKey = serviceKeys.some(function (key) {
-              return key in payload;
-            });
-            if (includesKey) {
-              for (_iterator = _createForOfIteratorHelperLoose(serviceKeys); !(_step = _iterator()).done;) {
-                key = _step.value;
-                orderServicesPayload[key] = key in payload ? payload[key] : orderDetails[key];
-                delete payload[key];
-                if ((orderServicesPayload == null ? void 0 : orderServicesPayload.assemble) === false && (orderServicesPayload == null ? void 0 : orderServicesPayload.disassemble) === false) {
-                  orderServicesPayload.assembly_type = null;
-                }
+            for (_i = 0, _serviceKeys = serviceKeys; _i < _serviceKeys.length; _i++) {
+              key = _serviceKeys[_i];
+              if (key in payload) {
+                payload[key] = payload[key];
+              } else if (key in orderDetails) {
+                payload[key] = orderDetails[key];
               }
             }
-            if (Object.keys(orderServicesPayload).length > 0) {
-              payload.order_services = [orderServicesPayload];
+            if ((payload == null ? void 0 : payload.assemble) === false && (payload == null ? void 0 : payload.disassemble) === false) {
+              payload.assembly_type = null;
             }
-            _context.next = 11;
+            _context.next = 9;
             return callUpdateOrderAPI({
               payload: [payload]
             });
-          case 11:
+          case 9:
             response = _context.sent;
             // const response = await updateOrder([payload]);
             setRecallOrders(true);
@@ -6207,7 +6218,21 @@ function OrderDetailsFooter() {
             } else {
               setOrderDetails(prevOrderDetails);
             }
+            _context.next = 14;
+            return callOrderAlertsApi();
           case 14:
+            alertsApiRes = _context.sent;
+            if ((alertsApiRes == null ? void 0 : alertsApiRes.code) === 200 && alertsApiRes != null && alertsApiRes.data) {
+              setOrderAlertsData(alertsApiRes == null ? void 0 : alertsApiRes.data);
+            }
+            _context.next = 18;
+            return callOrderStatusApi();
+          case 18:
+            orderStatusApiRes = _context.sent;
+            if ((orderStatusApiRes == null ? void 0 : orderStatusApiRes.code) === 200 && orderStatusApiRes != null && orderStatusApiRes.data) {
+              setOrderStatus(orderStatusApiRes == null ? void 0 : orderStatusApiRes.data);
+            }
+          case 20:
           case "end":
             return _context.stop();
         }
@@ -6217,6 +6242,7 @@ function OrderDetailsFooter() {
       return _ref.apply(this, arguments);
     };
   }();
+  //here changes needed
   return React__default.createElement(Container$y, null, React__default.createElement(AllowTracking, null), React__default.createElement(dmsComponentLibrary.Button, {
     onClick: onSave,
     disabled: isClientPortal ? true : !isDifferent() || errorFound()
@@ -6560,7 +6586,7 @@ var _templateObject$Y;
 function AuditLogs() {
   return React__default.createElement(Container$C, null, React__default.createElement(GenericAuditLogsTable, null));
 }
-var Container$C = /*#__PURE__*/styled__default.div(_templateObject$Y || (_templateObject$Y = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  height: 550px; /* Set height to limit container size */\n  overflow: auto; /* Enable scrolling */\n  scrollbar-width: thin;\n"])));
+var Container$C = /*#__PURE__*/styled__default.div(_templateObject$Y || (_templateObject$Y = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  height: 500px;\n  min-height: 200px;\n  max-height: 500px;\n  overflow: auto; /* Enable scrolling */\n  scrollbar-width: thin;\n"])));
 
 var _templateObject$Z, _templateObject2$J, _templateObject3$k, _templateObject4$b;
 // import { useLocation } from 'react-router-dom';
@@ -15004,38 +15030,32 @@ function ForceDebriefModal(props) {
   }();
   var ordersUpdateApi = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var ordersApiPayload, serviceKeys, orderServicesPayload, includesKey, _iterator, _step, key, _response$data, response, _response$data$, _response$data$2;
+      var ordersApiPayload, serviceKeys, _i, _serviceKeys, key, _response$data, response, _response$data$, _response$data$2;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             ordersApiPayload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
             serviceKeys = ['assemble', 'disassemble', 'unpack_items', 'collect_disposal', 'take_packaging_away', 'assembly_type'];
-            orderServicesPayload = {};
-            includesKey = serviceKeys.some(function (key) {
-              return key in ordersApiPayload;
-            });
-            if (includesKey) {
-              for (_iterator = _createForOfIteratorHelperLoose(serviceKeys); !(_step = _iterator()).done;) {
-                key = _step.value;
-                orderServicesPayload[key] = key in ordersApiPayload ? ordersApiPayload[key] : orderDetails[key];
-                delete ordersApiPayload[key];
-                if ((orderServicesPayload == null ? void 0 : orderServicesPayload.assemble) === false && (orderServicesPayload == null ? void 0 : orderServicesPayload.disassemble) === false) {
-                  orderServicesPayload.assembly_type = null;
-                }
+            for (_i = 0, _serviceKeys = serviceKeys; _i < _serviceKeys.length; _i++) {
+              key = _serviceKeys[_i];
+              if (key in ordersApiPayload) {
+                ordersApiPayload[key] = ordersApiPayload[key];
+              } else if (key in orderDetails) {
+                ordersApiPayload[key] = orderDetails[key];
               }
             }
-            if (Object.keys(orderServicesPayload).length > 0) {
-              ordersApiPayload.order_services = [orderServicesPayload];
+            if ((ordersApiPayload == null ? void 0 : ordersApiPayload.assemble) === false && (ordersApiPayload == null ? void 0 : ordersApiPayload.disassemble) === false) {
+              ordersApiPayload.assembly_type = null;
             }
-            _context2.prev = 6;
-            _context2.next = 9;
+            _context2.prev = 4;
+            _context2.next = 7;
             return callUpdateOrderAPI({
               payload: [ordersApiPayload]
             });
-          case 9:
+          case 7:
             response = _context2.sent;
             if (!(response.code === 200 && (response == null || (_response$data = response.data) == null ? void 0 : _response$data.length) > 0)) {
-              _context2.next = 17;
+              _context2.next = 15;
               break;
             }
             antd.notification.success({
@@ -15048,20 +15068,20 @@ function ForceDebriefModal(props) {
               recipient_name: response == null || (_response$data$ = response.data[0]) == null || (_response$data$ = _response$data$.order_recipient) == null ? void 0 : _response$data$.recipient_name,
               postcode: response == null || (_response$data$2 = response.data[0]) == null || (_response$data$2 = _response$data$2.order_recipient) == null ? void 0 : _response$data$2.postcode
             });
-            _context2.next = 17;
+            _context2.next = 15;
             return setRecallOrders(true);
-          case 17:
-            _context2.next = 22;
+          case 15:
+            _context2.next = 20;
             break;
-          case 19:
-            _context2.prev = 19;
-            _context2.t0 = _context2["catch"](6);
+          case 17:
+            _context2.prev = 17;
+            _context2.t0 = _context2["catch"](4);
             setOrderDetails(prevOrderDetails);
-          case 22:
+          case 20:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[6, 19]]);
+      }, _callee2, null, [[4, 17]]);
     }));
     return function ordersUpdateApi() {
       return _ref2.apply(this, arguments);