@bjsdistribution/dms-client-return 0.1.46-prod → 0.1.47-prod

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

@@ -9862,161 +9862,71 @@ function ConfirmOrder(props) {
       setOrderDetailsConfirmOrder(clone);
     };
   }, []);
-  function hasOnlyIdKey(obj) {
-    return Object.keys(obj).length === 1 && obj.hasOwnProperty('id');
-  }
-  var handleSuccess = function handleSuccess(message, res) {
-    var _res$data, _res$data2;
-    var apiMessage = (res == null || (_res$data = res.data) == null ? void 0 : _res$data.message) || (res == null ? void 0 : res.message) || (res == null || (_res$data2 = res.data) == null || (_res$data2 = _res$data2.data) == null ? void 0 : _res$data2.message);
-    notification.success({
-      message: 'Success',
-      description: apiMessage || message
-    });
-  };
-  var handleError = function handleError(error, fallback) {
-    var _err$response, _err$response2;
-    var err = error;
-    notification.error({
-      message: 'Request Failed',
-      description: (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) || fallback
-    });
-  };
   var executeActions = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _response, response, _response2, _response3, _response4, _response5, _response6, _response7, _response8;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.t0 = selectedAction;
-            _context.next = _context.t0 === 'decline_and_propose_new_date' ? 3 : _context.t0 === 'decline_and_confirm_new_date' ? 19 : _context.t0 === 'declined_proposed_date(outstanding)' ? 35 : _context.t0 === 'no_response_propose_new_date' ? 47 : _context.t0 === 'confirmed' ? 63 : 79;
+            _context.next = _context.t0 === 'decline_and_propose_new_date' ? 3 : _context.t0 === 'decline_and_confirm_new_date' ? 9 : _context.t0 === 'declined_proposed_date(outstanding)' ? 15 : _context.t0 === 'no_response_propose_new_date' ? 19 : _context.t0 === 'confirmed' ? 25 : 28;
             break;
           case 3:
-            _context.prev = 3;
             if (!((confirmedDate == null ? void 0 : confirmedDate.previousDate) !== null)) {
-              _context.next = 9;
+              _context.next = 6;
               break;
             }
-            _context.next = 7;
+            _context.next = 6;
             return declineDate();
-          case 7:
-            _response = _context.sent;
-            handleSuccess('Previous date declined successfully', _response);
-          case 9:
-            _context.next = 11;
+          case 6:
+            _context.next = 8;
             return proposeDate();
-          case 11:
-            response = _context.sent;
-            handleSuccess('New date proposed successfully', response);
-            _context.next = 18;
-            break;
-          case 15:
-            _context.prev = 15;
-            _context.t1 = _context["catch"](3);
-            handleError(_context.t1, 'Failed to propose new date');
-          case 18:
-            return _context.abrupt("break", 80);
-          case 19:
-            _context.prev = 19;
+          case 8:
+            return _context.abrupt("break", 29);
+          case 9:
             if (!((confirmedDate == null ? void 0 : confirmedDate.previousDate) !== null)) {
-              _context.next = 25;
+              _context.next = 12;
               break;
             }
-            _context.next = 23;
+            _context.next = 12;
             return declineDate();
-          case 23:
-            _response2 = _context.sent;
-            handleSuccess('Previous date declined successfully', _response2);
-          case 25:
-            _context.next = 27;
+          case 12:
+            _context.next = 14;
             return confirmDeliveryDate();
-          case 27:
-            _response3 = _context.sent;
-            handleSuccess('New date confirmed successfully', _response3);
-            _context.next = 34;
-            break;
-          case 31:
-            _context.prev = 31;
-            _context.t2 = _context["catch"](19);
-            handleError(_context.t2, 'Failed to confirm new date');
-          case 34:
-            return _context.abrupt("break", 80);
-          case 35:
-            _context.prev = 35;
+          case 14:
+            return _context.abrupt("break", 29);
+          case 15:
             if (!((confirmedDate == null ? void 0 : confirmedDate.previousDate) !== null)) {
-              _context.next = 41;
+              _context.next = 18;
               break;
             }
-            _context.next = 39;
+            _context.next = 18;
             return declineDate();
-          case 39:
-            _response4 = _context.sent;
-            handleSuccess('Proposed date declined successfully', _response4);
-          case 41:
-            _context.next = 46;
-            break;
-          case 43:
-            _context.prev = 43;
-            _context.t3 = _context["catch"](35);
-            handleError(_context.t3, 'Failed to decline proposed date');
-          case 46:
-            return _context.abrupt("break", 80);
-          case 47:
-            _context.prev = 47;
+          case 18:
+            return _context.abrupt("break", 29);
+          case 19:
             if (!((confirmedDate == null ? void 0 : confirmedDate.previousDate) !== null)) {
-              _context.next = 53;
+              _context.next = 22;
               break;
             }
-            _context.next = 51;
+            _context.next = 22;
             return declineDate();
-          case 51:
-            _response5 = _context.sent;
-            handleSuccess('Previous date declined successfully', _response5);
-          case 53:
-            _context.next = 55;
+          case 22:
+            _context.next = 24;
             return noResponseApi();
-          case 55:
-            _response6 = _context.sent;
-            handleSuccess('No response date proposed successfully', _response6);
-            _context.next = 62;
-            break;
-          case 59:
-            _context.prev = 59;
-            _context.t4 = _context["catch"](47);
-            handleError(_context.t4, 'Failed to propose date (no response)');
-          case 62:
-            return _context.abrupt("break", 80);
-          case 63:
-            _context.prev = 63;
-            if (!((confirmedDate == null ? void 0 : confirmedDate.previousDate) !== null)) {
-              _context.next = 69;
-              break;
-            }
-            _context.next = 67;
-            return declineDate();
-          case 67:
-            _response7 = _context.sent;
-            handleSuccess('Previous date declined successfully', _response7);
-          case 69:
-            _context.next = 71;
+          case 24:
+            return _context.abrupt("break", 29);
+          case 25:
+            _context.next = 27;
             return confirmDeliveryDate();
-          case 71:
-            _response8 = _context.sent;
-            handleSuccess('Delivery date confirmed successfully', _response8);
-            _context.next = 78;
-            break;
-          case 75:
-            _context.prev = 75;
-            _context.t5 = _context["catch"](63);
-            handleError(_context.t5, 'Failed to confirm delivery date');
-          case 78:
-            return _context.abrupt("break", 80);
-          case 79:
-            return _context.abrupt("break", 80);
-          case 80:
+          case 27:
+            return _context.abrupt("break", 29);
+          case 28:
+            return _context.abrupt("break", 29);
+          case 29:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[3, 15], [19, 31], [35, 43], [47, 59], [63, 75]]);
+      }, _callee);
     }));
     return function executeActions() {
       return _ref.apply(this, arguments);
@@ -10024,60 +9934,35 @@ function ConfirmOrder(props) {
   }();
   var executeSendComs = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var response, _response9, _response10;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.t0 = selectedAction;
-            _context2.next = _context2.t0 === 'left_message' ? 3 : _context2.t0 === 'contact_made' ? 3 : _context2.t0 === 'no_contact' ? 3 : _context2.t0 === 'precall' ? 14 : 30;
+            _context2.next = _context2.t0 === 'left_message' ? 3 : _context2.t0 === 'contact_made' ? 3 : _context2.t0 === 'no_contact' ? 3 : _context2.t0 === 'precall' ? 5 : 11;
             break;
           case 3:
-            _context2.prev = 3;
-            _context2.next = 6;
-            return notificationCall();
-          case 6:
-            response = _context2.sent;
-            handleSuccess('Notification sent successfully', response);
-            _context2.next = 13;
-            break;
-          case 10:
-            _context2.prev = 10;
-            _context2.t1 = _context2["catch"](3);
-            handleError(_context2.t1, 'Failed to send notification');
-          case 13:
-            return _context2.abrupt("break", 31);
-          case 14:
-            _context2.prev = 14;
+            // Only send comms (Update Order already handled in confirmOrder)
+            notificationCall();
+            return _context2.abrupt("break", 12);
+          case 5:
             if (!((confirmedDate == null ? void 0 : confirmedDate.previousDate) !== null)) {
-              _context2.next = 20;
+              _context2.next = 8;
               break;
             }
-            _context2.next = 18;
+            _context2.next = 8;
             return declineDate();
-          case 18:
-            _response9 = _context2.sent;
-            handleSuccess('Previous date declined successfully', _response9);
-          case 20:
-            _context2.next = 22;
+          case 8:
+            _context2.next = 10;
             return sendComs();
-          case 22:
-            _response10 = _context2.sent;
-            handleSuccess('Precall communication sent successfully', _response10);
-            _context2.next = 29;
-            break;
-          case 26:
-            _context2.prev = 26;
-            _context2.t2 = _context2["catch"](14);
-            handleError(_context2.t2, 'Failed to send precall communication');
-          case 29:
-            return _context2.abrupt("break", 31);
-          case 30:
-            return _context2.abrupt("break", 31);
-          case 31:
+          case 10:
+            return _context2.abrupt("break", 12);
+          case 11:
+            return _context2.abrupt("break", 12);
+          case 12:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[3, 10], [14, 26]]);
+      }, _callee2);
     }));
     return function executeSendComs() {
       return _ref2.apply(this, arguments);
@@ -10085,17 +9970,16 @@ function ConfirmOrder(props) {
   }();
   var confirmOrder = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var keysToRemovefromOrders, filteredOrderDetails, filteredPrevOrderDetails, payload, updatedPayload, notUpdateOrder, _response$data, response, updatedOrder, formattedDate;
+      var keysToRemovefromOrders, filteredOrderDetails, filteredPrevOrderDetails, payload, restrictedActions, isRestrictedAction, updatedPayload, keys, notUpdateOrder, shouldUpdateOrder, _response$data, response, updatedOrder, formattedDate;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context3.prev = 0;
             if (!(selectedAction === 'left_message' || selectedAction === 'contact_made' || selectedAction === 'no_contact' || selectedAction === 'precall')) {
-              _context3.next = 8;
+              _context3.next = 7;
               break;
             }
             if (!((contactHome == null ? void 0 : contactHome.length) === 0 && (contactMobile == null ? void 0 : contactMobile.length) === 0 && (contactWork == null ? void 0 : contactWork.length) === 0)) {
-              _context3.next = 5;
+              _context3.next = 4;
               break;
             }
             notification.info({
@@ -10103,9 +9987,9 @@ function ConfirmOrder(props) {
               description: 'Please add contact information'
             });
             return _context3.abrupt("return");
-          case 5:
+          case 4:
             if (!((confirmedDate == null ? void 0 : confirmedDate.previousDate) === null && (confirmedDate == null ? void 0 : confirmedDate.currentDate) === null)) {
-              _context3.next = 8;
+              _context3.next = 7;
               break;
             }
             notification.info({
@@ -10113,116 +9997,63 @@ function ConfirmOrder(props) {
               description: 'Please add delivery date'
             });
             return _context3.abrupt("return");
-          case 8:
-            keysToRemovefromOrders = ['order_locked', 'order_communications', 'updated_at', 'updated_by', 'stock_alias', 'order_delivery_declined_dates', 'order_eta_updates', 'order_status', 'tomtom_status', 'refused_service', 'order_type', 'order_failures', 'order_on_hold', 'order_cancellations', 'order_routes'];
+          case 7:
+            keysToRemovefromOrders = ['order_locked', 'order_communications', 'updated_at', 'updated_by', 'stock_alias', 'order_delivery_declined_dates', 'order_eta_updates', 'order_status', 'tomtom_status', 'refused_service', 'order_type', 'order_failures', 'order_on_hold', 'order_cancellations', 'order_routes', 'order_services', 'labels'];
             filteredOrderDetails = filterObject(orderDetailsConfirmOrder, keysToRemovefromOrders);
             filteredPrevOrderDetails = filterObject(prevOrderDetails, keysToRemovefromOrders);
             payload = compareOrderDetailsStates(filteredPrevOrderDetails, filteredOrderDetails);
+            restrictedActions = ['decline_and_confirm_new_date', 'decline_and_propose_new_date', 'declined_proposed_date(outstanding)', 'confirmed', 'no_response_propose_new_date'];
+            isRestrictedAction = restrictedActions.includes(selectedAction);
             updatedPayload = _extends({}, payload, {
               action_date: confirmedDate == null ? void 0 : confirmedDate.currentDate
-            });
-            notUpdateOrder = hasOnlyIdKey(updatedPayload);
-            if (notUpdateOrder) {
-              _context3.next = 26;
+            }); // ✅ Remove action_date for restricted actions
+            if (isRestrictedAction) {
+              delete updatedPayload.action_date;
+            }
+            keys = Object.keys(updatedPayload);
+            notUpdateOrder = keys.length === 1 && keys.includes('id');
+            shouldUpdateOrder = !notUpdateOrder;
+            if (!shouldUpdateOrder) {
+              _context3.next = 23;
               break;
             }
-            _context3.prev = 15;
-            _context3.next = 18;
+            _context3.next = 21;
             return callUpdateOrderAPI({
               payload: [updatedPayload]
             });
-          case 18:
+          case 21:
             response = _context3.sent;
             if ((response == null || (_response$data = response.data) == null ? void 0 : _response$data.length) > 0) {
               updatedOrder = response == null ? void 0 : response.data[0];
               setOrderDetails(updatedOrder);
               setPrevOrderDetails(updatedOrder);
-              handleSuccess('Order updated successfully', response);
             } else {
               setOrderDetails(prevOrderDetails);
             }
-            _context3.next = 26;
-            break;
-          case 22:
-            _context3.prev = 22;
-            _context3.t0 = _context3["catch"](15);
-            handleError(_context3.t0, 'Failed to update order');
-            setOrderDetails(prevOrderDetails);
-          case 26:
-            _context3.prev = 26;
-            _context3.next = 29;
+          case 23:
+            _context3.next = 25;
             return executeActions();
-          case 29:
-            _context3.next = 34;
-            break;
-          case 31:
-            _context3.prev = 31;
-            _context3.t1 = _context3["catch"](26);
-            handleError(_context3.t1, 'Failed to execute actions');
-          case 34:
-            _context3.prev = 34;
-            _context3.next = 37;
+          case 25:
+            _context3.next = 27;
             return executeSendComs();
-          case 37:
-            _context3.next = 42;
-            break;
-          case 39:
-            _context3.prev = 39;
-            _context3.t2 = _context3["catch"](34);
-            handleError(_context3.t2, 'Failed to send communications');
-          case 42:
+          case 27:
             if (orderId && deliveryDate) {
               formattedDate = format(new Date(deliveryDate), 'yyyy-MM-dd');
               setDeliveryDate(formattedDate);
             }
-            _context3.prev = 43;
-            _context3.next = 46;
-            return props == null ? void 0 : props.callOrderStatusApi();
-          case 46:
-            handleSuccess('Order status refreshed successfully');
-            _context3.next = 52;
-            break;
-          case 49:
-            _context3.prev = 49;
-            _context3.t3 = _context3["catch"](43);
-            handleError(_context3.t3, 'Failed to refresh order status');
-          case 52:
-            _context3.prev = 52;
-            _context3.next = 55;
+            setTimeout(function () {
+              props == null || props.callOrderStatusApi();
+            }, 1000);
+            _context3.next = 31;
             return props == null ? void 0 : props.callOrderAlertsApi();
-          case 55:
-            handleSuccess('Order alerts refreshed successfully');
-            _context3.next = 61;
-            break;
-          case 58:
-            _context3.prev = 58;
-            _context3.t4 = _context3["catch"](52);
-            handleError(_context3.t4, 'Failed to refresh alerts');
-          case 61:
-            _context3.prev = 61;
-            _context3.next = 64;
+          case 31:
+            _context3.next = 33;
             return props == null ? void 0 : props.callOrdersApi();
-          case 64:
-            handleSuccess('Orders refreshed successfully');
-            _context3.next = 70;
-            break;
-          case 67:
-            _context3.prev = 67;
-            _context3.t5 = _context3["catch"](61);
-            handleError(_context3.t5, 'Failed to refresh orders');
-          case 70:
-            handleSuccess('Order processed successfully');
-            _context3.next = 76;
-            break;
-          case 73:
-            _context3.prev = 73;
-            _context3.t6 = _context3["catch"](0);
-            handleError(_context3.t6, 'Something went wrong');
-          case 76:
+          case 33:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[0, 73], [15, 22], [26, 31], [34, 39], [43, 49], [52, 58], [61, 67]]);
+      }, _callee3);
     }));
     return function confirmOrder() {
       return _ref3.apply(this, arguments);