umwd-components 0.1.694 → 0.1.696

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "umwd-components",
-  "version": "0.1.694",
+  "version": "0.1.696",
   "description": "UMWD Component library",
   "main": "dist/src/index.js",
   "module": "dist/src/index.js",

package/src/components/e-commerce/iro/TextualManageIROForm.tsx

@@ -346,6 +346,15 @@ function OverwritesDialog({
   );
 }
 
+interface ConfirmFormDialogProps {
+  open: boolean;
+  handleClose: () => void;
+  orderID: number;
+  currentStatus: "requested" | "finalising_process";
+  revalidateCallback?: () => void;
+  openOverwritesDialog?: () => void;
+}
+
 function ConfirmFormDialog({
   open,
   handleClose,
@@ -353,14 +362,50 @@ function ConfirmFormDialog({
   currentStatus,
   revalidateCallback,
   openOverwritesDialog,
-}: {
-  open: boolean;
-  handleClose: () => void;
-  orderID: number;
-  currentStatus: "requested" | "finalising_process";
-  revalidateCallback?: () => void;
-  openOverwritesDialog?: () => void;
-}) {
+}: ConfirmFormDialogProps): React.JSX.Element {
+  const { handleAddMessage } = useSnackbar();
+
+  const handleConfirm = async () => {
+    if (
+      currentStatus !== "requested" &&
+      currentStatus !== "finalising_process"
+    ) {
+      handleAddMessage({
+        message: "Cannot confirm return order in current status",
+        severity: "error",
+      });
+      return;
+    }
+
+    if (currentStatus === "finalising_process") {
+      if (!openOverwritesDialog) {
+        handleAddMessage({
+          message: "Please provide overwrites for the invoice",
+          severity: "error",
+        });
+        return;
+      }
+      openOverwritesDialog();
+      handleClose();
+      return;
+    }
+
+    try {
+      await confirmationService("iros", [orderID]);
+      handleAddMessage({
+        message: "Return order confirmed successfully",
+        severity: "success",
+      });
+      revalidateCallback && revalidateCallback();
+      handleClose();
+    } catch (error) {
+      handleAddMessage({
+        message: "Failed to confirm return order",
+        severity: "error",
+      });
+    }
+  };
+
   return (
     <Dialog open={open}>
       <DialogTitle>Confirm Return</DialogTitle>
@@ -390,7 +435,8 @@ function ConfirmFormDialog({
       <DialogActions>
         <Button
           variant="contained"
-          onClick={(e) => {
+          onClick={handleConfirm}
+          /* (e) => {
             if (currentStatus === "finalising_process") {
               openOverwritesDialog && openOverwritesDialog();
               handleClose();
@@ -399,7 +445,7 @@ function ConfirmFormDialog({
               revalidateCallback && revalidateCallback();
               handleClose();
             }
-          }}
+          } */
         >
           Yes
         </Button>
@@ -424,6 +470,33 @@ function CancelIroDialog({
 }) {
   const [reason, setRoason] = useState<string>("");
   const [reasonError, setReasonError] = useState<string>("");
+
+  const { handleAddMessage } = useSnackbar();
+
+  const handleCancel = async () => {
+    if (reason.length < 5) {
+      setReasonError(
+        "Please provide a reason for the cancellation (min 5 characters)"
+      );
+      return;
+    }
+    setReasonError("");
+    try {
+      await cancellationService("iros", orderID, reason);
+      handleAddMessage({
+        message: "Return order cancelled successfully",
+        severity: "success",
+      });
+      revalidateCallback && revalidateCallback();
+      handleClose();
+    } catch (error) {
+      handleAddMessage({
+        message: "Failed to cancel return order",
+        severity: "error",
+      });
+    }
+  };
+
   return (
     <form>
       <Dialog open={open}>
@@ -460,22 +533,11 @@ function CancelIroDialog({
           </Stack>
         </DialogContent>
         <DialogActions>
-          <Button
-            variant="contained"
-            onClick={(e) => {
-              if (reason.length < 5) {
-                setReasonError("Please provide a reason for the cancellation");
-                return;
-              }
-              cancellationService("iros", orderID, reason);
-              revalidateCallback && revalidateCallback();
-              handleClose();
-            }}
-          >
-            Yes
+          <Button variant="outlined" onClick={handleClose}>
+            Close
           </Button>
-          <Button variant="contained" onClick={handleClose}>
-            No
+          <Button variant="contained" color="error" onClick={handleCancel}>
+            Confirm Cancellation
           </Button>
         </DialogActions>
       </Dialog>

package/src/components/e-commerce/opo/TextualManageOpoForm.tsx

@@ -55,19 +55,21 @@ const INITIAL_STATE = {
 
 const options = ["picked", "packed", "shipped", "reports"] as const;
 
+interface ConfirmFormDialogProps {
+  open: boolean;
+  handleClose: () => void;
+  orderID: number;
+  currentStatus: "placed" | "external_shipping_process";
+  revalidateCallback?: () => void;
+}
+
 function ConfirmFormDialog({
   open,
   handleClose,
   orderID,
   currentStatus,
   revalidateCallback,
-}: {
-  open: boolean;
-  handleClose: () => void;
-  orderID: number;
-  currentStatus: "placed" | "external_shipping_process";
-  revalidateCallback?: () => void;
-}) {
+}: ConfirmFormDialogProps): React.JSX.Element {
   return (
     <Dialog open={open}>
       <DialogTitle>Confirm Order</DialogTitle>
@@ -96,19 +98,48 @@ function ConfirmFormDialog({
   );
 }
 
+interface CancelOpoDialogProps {
+  open: boolean;
+  handleClose: () => void;
+  orderID: number;
+  revalidateCallback?: () => void;
+}
+
 function CancelOpoDialog({
   open,
   handleClose,
   orderID,
   revalidateCallback,
-}: {
-  open: boolean;
-  handleClose: () => void;
-  orderID: number;
-  revalidateCallback?: () => void;
-}) {
+}: CancelOpoDialogProps): React.JSX.Element {
   const [reason, setRoason] = useState<string>("");
   const [reasonError, setReasonError] = useState<string>("");
+
+  const { handleAddMessage } = useSnackbar();
+
+  const handleCancel = async () => {
+    if (reason.length < 5) {
+      setReasonError(
+        "Please provide a reason for the cancellation (min 5 characters)"
+      );
+      return;
+    }
+    setReasonError("");
+    try {
+      await cancellationService("opos", orderID, reason);
+      handleAddMessage({
+        message: "Order cancelled successfully",
+        severity: "success",
+      });
+      revalidateCallback && revalidateCallback();
+      handleClose();
+    } catch (error) {
+      handleAddMessage({
+        message: "Failed to cancel order",
+        severity: "error",
+      });
+    }
+  };
+
   return (
     <form>
       <Dialog open={open}>
@@ -143,23 +174,11 @@ function CancelOpoDialog({
           </Stack>
         </DialogContent>
         <DialogActions>
-          <Button
-            variant="contained"
-            onClick={async (e) => {
-              if (reason.length < 5) {
-                setReasonError("Please provide a reason for the cancellation");
-                return;
-              }
-              const res = await cancellationService("opos", orderID, reason);
-              console.log("Cancellation response", res);
-              revalidateCallback && revalidateCallback();
-              handleClose();
-            }}
-          >
-            Yes
+          <Button variant="outlined" onClick={handleClose}>
+            Close
           </Button>
-          <Button variant="contained" onClick={handleClose}>
-            No
+          <Button variant="contained" color="error" onClick={handleCancel}>
+            Confirm Cancellation
           </Button>
         </DialogActions>
       </Dialog>

package/src/components/logistics/ipo/TextualManageIPOForm.tsx

@@ -133,14 +133,14 @@ function CancelIpoDialog({
     try {
       await cancellationService("ipos", orderID, reason);
       handleAddMessage({
-        message: "IPO cancelled successfully",
+        message: "Order cancelled successfully",
         severity: "success",
       });
       revalidateCallback && revalidateCallback();
       handleClose();
     } catch (error) {
       handleAddMessage({
-        message: "Failed to cancel IPO",
+        message: "Failed to cancel order",
         severity: "error",
       });
     }
@@ -180,7 +180,7 @@ function CancelIpoDialog({
       </DialogContent>
       <DialogActions>
         <Button variant="outlined" onClick={handleClose}>
-          Cancel
+          Close
         </Button>
         <Button variant="contained" color="error" onClick={handleCancel}>
           Confirm Cancellation

package/src/data/services/common/cancellation-service.ts

@@ -3,7 +3,6 @@
 import { getAuthToken } from "../get-token";
 import { getStrapiURL } from "../../../lib/utils"; //"@/lib/utils";
 
-// TODO move to common services
 export async function cancellationService(
   path: string,
   id: number,

package/src/data/services/common/confirmation-service.ts

@@ -4,7 +4,6 @@ import { getAuthToken } from "../get-token";
 import { getStrapiURL } from "../../../lib/utils"; //"@/lib/utils";
 import { InvoiceOverwrites } from "../../../types/e-commerce/invoice/types";
 
-// TODO move to common services
 export async function confirmationService(
   path: string,
   ids: number[],