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

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.46-prod",
+  "version": "0.1.47-prod",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/order-view/order-actions/actions/confirm-order/index.tsx

@@ -119,99 +119,42 @@ function ConfirmOrder(props: IProps) {
     };
   }, []);
 
-  function hasOnlyIdKey(obj: any) {
-    return Object.keys(obj).length === 1 && obj.hasOwnProperty('id');
-  }
-
-  const handleSuccess = (message: string, res?: any) => {
-    const apiMessage =
-      res?.data?.message || res?.message || res?.data?.data?.message;
-
-    notification.success({
-      message: 'Success',
-      description: apiMessage || message,
-    });
-  };
-
-  const handleError = (error: any, fallback: string) => {
-    const err = error as any;
-    notification.error({
-      message: 'Request Failed',
-      description:
-        err?.response?.data?.error ||
-        err?.response?.data?.message ||
-        err?.message ||
-        fallback,
-    });
-  };
-
   const executeActions = async () => {
     switch (selectedAction) {
       case 'decline_and_propose_new_date':
-        try {
-          if (confirmedDate?.previousDate !== null) {
-            const response = (await declineDate()) as any;
-            handleSuccess('Previous date declined successfully', response);
-          }
-
-          const response = (await proposeDate()) as any;
-          handleSuccess('New date proposed successfully', response);
-        } catch (error) {
-          handleError(error, 'Failed to propose new date');
+        // Decline → Propose
+        if (confirmedDate?.previousDate !== null) {
+          await declineDate();
         }
+        await proposeDate();
         break;
 
       case 'decline_and_confirm_new_date':
-        try {
-          if (confirmedDate?.previousDate !== null) {
-            const response = (await declineDate()) as any;
-            handleSuccess('Previous date declined successfully', response);
-          }
-
-          const response = (await confirmDeliveryDate()) as any;
-          handleSuccess('New date confirmed successfully', response);
-        } catch (error) {
-          handleError(error, 'Failed to confirm new date');
+        // Decline → Confirm
+        if (confirmedDate?.previousDate !== null) {
+          await declineDate();
         }
+        await confirmDeliveryDate();
         break;
 
       case 'declined_proposed_date(outstanding)':
-        try {
-          if (confirmedDate?.previousDate !== null) {
-            const response = (await declineDate()) as any;
-            handleSuccess('Proposed date declined successfully', response);
-          }
-        } catch (error) {
-          handleError(error, 'Failed to decline proposed date');
+        // Only Decline
+        if (confirmedDate?.previousDate !== null) {
+          await declineDate();
         }
         break;
 
       case 'no_response_propose_new_date':
-        try {
-          if (confirmedDate?.previousDate !== null) {
-            const response = (await declineDate()) as any;
-            handleSuccess('Previous date declined successfully', response);
-          }
-
-          const response = (await noResponseApi()) as any;
-          handleSuccess('No response date proposed successfully', response);
-        } catch (error) {
-          handleError(error, 'Failed to propose date (no response)');
+        // Decline (always previous date) → No Response Propose
+        if (confirmedDate?.previousDate !== null) {
+          await declineDate();
         }
+        await noResponseApi();
         break;
 
       case 'confirmed':
-        try {
-          if (confirmedDate?.previousDate !== null) {
-            const response = (await declineDate()) as any;
-            handleSuccess('Previous date declined successfully', response);
-          }
-
-          const response = (await confirmDeliveryDate()) as any;
-          handleSuccess('Delivery date confirmed successfully', response);
-        } catch (error) {
-          handleError(error, 'Failed to confirm delivery date');
-        }
+        // Only Confirm
+        await confirmDeliveryDate();
         break;
 
       default:
@@ -224,26 +167,16 @@ function ConfirmOrder(props: IProps) {
       case 'left_message':
       case 'contact_made':
       case 'no_contact':
-        try {
-          const response = (await notificationCall()) as any;
-          handleSuccess('Notification sent successfully', response);
-        } catch (error) {
-          handleError(error, 'Failed to send notification');
-        }
+        // Only send comms (Update Order already handled in confirmOrder)
+        notificationCall();
         break;
 
       case 'precall':
-        try {
-          if (confirmedDate?.previousDate !== null) {
-            const response = (await declineDate()) as any;
-            handleSuccess('Previous date declined successfully', response);
-          }
-
-          const response = (await sendComs()) as any;
-          handleSuccess('Precall communication sent successfully', response);
-        } catch (error) {
-          handleError(error, 'Failed to send precall communication');
+        // Decline → Send Comms
+        if (confirmedDate?.previousDate !== null) {
+          await declineDate();
         }
+        await sendComs();
         break;
 
       default:
@@ -252,139 +185,131 @@ function ConfirmOrder(props: IProps) {
   };
 
   const confirmOrder = async () => {
-    try {
+    if (
+      selectedAction === 'left_message' ||
+      selectedAction === 'contact_made' ||
+      selectedAction === 'no_contact' ||
+      selectedAction === 'precall'
+    ) {
       if (
-        selectedAction === 'left_message' ||
-        selectedAction === 'contact_made' ||
-        selectedAction === 'no_contact' ||
-        selectedAction === 'precall'
+        contactHome?.length === 0 &&
+        contactMobile?.length === 0 &&
+        contactWork?.length === 0
       ) {
-        if (
-          contactHome?.length === 0 &&
-          contactMobile?.length === 0 &&
-          contactWork?.length === 0
-        ) {
-          notification.info({
-            message: 'Info',
-            description: 'Please add contact information',
-          });
-          return;
-        }
-
-        if (
-          confirmedDate?.previousDate === null &&
-          confirmedDate?.currentDate === null
-        ) {
-          notification.info({
-            message: 'Info',
-            description: 'Please add delivery date',
-          });
-          return;
-        }
+        notification.info({
+          message: 'Info',
+          description: 'Please add contact information',
+        });
+        return;
       }
+      if (
+        confirmedDate?.previousDate === null &&
+        confirmedDate?.currentDate === null
+      ) {
+        notification.info({
+          message: 'Info',
+          description: 'Please add delivery date',
+        });
+        return;
+      }
+    }
 
-      const 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',
-      ];
-
-      const filteredOrderDetails = filterObject(
-        orderDetailsConfirmOrder,
-        keysToRemovefromOrders
-      );
-
-      const filteredPrevOrderDetails = filterObject(
-        prevOrderDetails,
-        keysToRemovefromOrders
-      );
-
-      const payload = compareOrderDetailsStates(
-        filteredPrevOrderDetails,
-        filteredOrderDetails
-      );
-
-      const updatedPayload = {
-        ...payload,
-        action_date: confirmedDate?.currentDate,
-      };
+    const 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',
+    ];
+
+    const filteredOrderDetails = filterObject(
+      orderDetailsConfirmOrder,
+      keysToRemovefromOrders
+    );
+
+    const filteredPrevOrderDetails = filterObject(
+      prevOrderDetails,
+      keysToRemovefromOrders
+    );
+
+    const payload = compareOrderDetailsStates(
+      filteredPrevOrderDetails,
+      filteredOrderDetails
+    );
+
+    const restrictedActions = [
+      'decline_and_confirm_new_date',
+      'decline_and_propose_new_date',
+      'declined_proposed_date(outstanding)',
+      'confirmed',
+      'no_response_propose_new_date',
+    ];
+
+    const isRestrictedAction = restrictedActions.includes(selectedAction);
+
+    const updatedPayload: any = {
+      ...payload,
+      action_date: confirmedDate?.currentDate,
+    };
 
-      const notUpdateOrder = hasOnlyIdKey(updatedPayload);
-
-      if (!notUpdateOrder) {
-        try {
-          const response = (await callUpdateOrderAPI({
-            payload: [updatedPayload],
-          })) as any;
-
-          if (response?.data?.length > 0) {
-            const updatedOrder = response?.data[0];
-            setOrderDetails(updatedOrder);
-            setPrevOrderDetails(updatedOrder);
-            handleSuccess('Order updated successfully', response);
-          } else {
-            setOrderDetails(prevOrderDetails);
-          }
-        } catch (error) {
-          handleError(error, 'Failed to update order');
-          setOrderDetails(prevOrderDetails);
-        }
-      }
+    // ✅ Remove action_date for restricted actions
+    if (isRestrictedAction) {
+      delete updatedPayload.action_date;
+    }
 
-      try {
-        await executeActions();
-      } catch (error) {
-        handleError(error, 'Failed to execute actions');
-      }
+    const keys = Object.keys(updatedPayload);
 
-      try {
-        await executeSendComs();
-      } catch (error) {
-        handleError(error, 'Failed to send communications');
-      }
+    const notUpdateOrder = keys.length === 1 && keys.includes('id');
 
-      if (orderId && deliveryDate) {
-        const formattedDate = format(new Date(deliveryDate), 'yyyy-MM-dd');
-        setDeliveryDate(formattedDate);
-      }
+    const shouldUpdateOrder = !notUpdateOrder;
 
-      try {
-        await props?.callOrderStatusApi();
-        handleSuccess('Order status refreshed successfully');
-      } catch (error) {
-        handleError(error, 'Failed to refresh order status');
-      }
+    if (shouldUpdateOrder) {
+      const response = (await callUpdateOrderAPI({
+        payload: [updatedPayload],
+      })) as {
+        code: number | null;
+        error?: string | null | undefined;
+        [key: string]: any;
+      };
 
-      try {
-        await props?.callOrderAlertsApi();
-        handleSuccess('Order alerts refreshed successfully');
-      } catch (error) {
-        handleError(error, 'Failed to refresh alerts');
+      if (response?.data?.length > 0) {
+        const updatedOrder = response?.data[0];
+        setOrderDetails(updatedOrder);
+        setPrevOrderDetails(updatedOrder);
+      } else {
+        setOrderDetails(prevOrderDetails);
       }
+    }
 
-      try {
-        await props?.callOrdersApi();
-        handleSuccess('Orders refreshed successfully');
-      } catch (error) {
-        handleError(error, 'Failed to refresh orders');
-      }
+    // ✅ Execute action flow
+    await executeActions();
 
-      handleSuccess('Order processed successfully');
-    } catch (error) {
-      handleError(error, 'Something went wrong');
+    // ✅ Execute comms flow
+    await executeSendComs();
+
+    if (orderId && deliveryDate) {
+      const formattedDate = format(new Date(deliveryDate), 'yyyy-MM-dd');
+      setDeliveryDate(formattedDate);
     }
+
+    setTimeout(() => {
+      props?.callOrderStatusApi();
+    }, 1000);
+
+    await props?.callOrderAlertsApi();
+    await props?.callOrdersApi();
   };
 
   const errorFound = () => {