umwd-components 0.1.660 → 0.1.661

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

@@ -1,16 +1,21 @@
 import React, { useEffect, useState } from "react";
 import { useFormState } from "react-dom";
+import { useSnackbar } from "../../../context/common/SnackbarContext";
 import { updateIpoAction } from "../../../data/actions/logistics/ipo/updateIpoAction";
-import { UploadBase64MediaForm } from "../../../components/common/media/UploadBase64MediaForm";
-import downloadBase64File from "../../../data/loaders/common/media/downloadBase64File";
-import TextualIPOItemUpdater from "./TextualIPOItemUpdater";
-import ItemDisplay from "./ItemDisplay";
 import { IpoItem, ManageIpoFormProps } from "../../../types/logistics/Ipo";
-import NotesDisplay from "../note/NotesDisplay";
+import { confirmationService } from "../../../data/services/common/confirmation-service";
+import { cancellationService } from "../../../data/services/common/cancellation-service";
+import downloadBase64File from "../../../data/loaders/common/media/downloadBase64File";
+import { UploadBase64MediaForm } from "../../common/media/UploadBase64MediaForm";
 import NoteTakingComponent from "../note/NoteTakingComponent";
-import { StrapiErrors } from "../../../components/StrapiErrors";
-import { SubmitButton } from "../../../components/SubmitButton";
-import Alert from "@mui/material/Alert";
+import NotesDisplay from "../note/NotesDisplay";
+import ItemDisplay from "./ItemDisplay";
+import TextualIPOItemUpdater from "./TextualIPOItemUpdater";
+import { IpoStatusIndicator } from "./IpoStatusIndicator";
+
+import Box from "@mui/material/Box";
+import Stack from "@mui/material/Stack";
+import Paper from "@mui/material/Paper";
 import Dialog from "@mui/material/Dialog";
 import DialogActions from "@mui/material/DialogActions";
 import DialogContent from "@mui/material/DialogContent";
@@ -18,56 +23,65 @@ import DialogTitle from "@mui/material/DialogTitle";
 import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
 import Grid from "@mui/material/Grid";
-import Box from "@mui/material/Box";
-import Paper from "@mui/material/Paper";
-import Stack from "@mui/material/Stack";
 import Divider from "@mui/material/Divider";
-import { confirmationService } from "../../../data/services/common/confirmation-service";
-import { cancellationService } from "../../../data/services/common/cancellation-service";
-import { PreReport } from "../../../types/logistics/Report";
-import {
-  FormControlLabel,
-  Checkbox,
-  List,
-  ListItem,
-  TextField,
-  DialogContentText,
-  CircularProgress,
-} from "@mui/material";
+import TextField from "@mui/material/TextField";
+import List from "@mui/material/List";
+import ListItem from "@mui/material/ListItem";
+import Alert from "@mui/material/Alert";
+import Checkbox from "@mui/material/Checkbox";
+import FormControlLabel from "@mui/material/FormControlLabel";
+
 import NumbersIcon from "@mui/icons-material/Numbers";
-import AssignmentReturnIcon from "@mui/icons-material/AssignmentReturn";
+import DescriptionIcon from "@mui/icons-material/Description";
 import CalendarTodayIcon from "@mui/icons-material/CalendarToday";
 import BusinessIcon from "@mui/icons-material/Business";
-import DescriptionIcon from "@mui/icons-material/Description";
 import UpdateIcon from "@mui/icons-material/Update";
-import { IpoStatusIndicator } from "./IpoStatusIndicator";
-import { InvoiceOverwrites } from "../../../types/e-commerce/invoice/types";
-import { Ipo } from "../../../types/logistics/Ipo";
-import { queryAllProducts } from "../../../data/loaders/e-commerce/queryAllProducts";
-import qs from "qs";
-import { Product } from "../../../types/e-commerce/product/types";
-import { useSnackbar } from "../../../context/common/SnackbarContext";
+import { SubmitButton } from "../../SubmitButton";
+
+import { PreReport } from "../../../types/logistics/Report";
 
 const INITIAL_STATE = {
   zodErrors: null,
   strapiErrors: null,
   data: null,
   message: null,
+  severity: null,
 };
 
+interface ConfirmFormDialogProps {
+  open: boolean;
+  handleClose: () => void;
+  orderID: number;
+  currentStatus: "placed" | "released_on_stock";
+  revalidateCallback?: () => void;
+}
+
 function ConfirmFormDialog({
   open,
   handleClose,
   orderID,
   currentStatus,
   revalidateCallback,
-}: {
-  open: boolean;
-  handleClose: () => void;
-  orderID: number;
-  currentStatus: "placed" | "released_on_stock";
-  revalidateCallback?: () => void;
-}) {
+}: ConfirmFormDialogProps): React.ReactElement {
+  const { handleAddMessage } = useSnackbar();
+
+  const handleConfirm = async () => {
+    try {
+      await confirmationService("ipos", [orderID]);
+      handleAddMessage({
+        message: "IPO confirmed successfully",
+        severity: "success",
+      });
+      revalidateCallback && revalidateCallback();
+      handleClose();
+    } catch (error) {
+      handleAddMessage({
+        message: "Failed to confirm IPO",
+        severity: "error",
+      });
+    }
+  };
+
   return (
     <Dialog open={open}>
       <DialogTitle>Confirm Order</DialogTitle>
@@ -75,109 +89,121 @@ function ConfirmFormDialog({
         <Stack spacing={2}>
           <Typography>Are you sure you want to confirm this order?</Typography>
           <Typography>Current status: {currentStatus}</Typography>
+          <Alert severity="info">
+            Once confirmed, the order will be available for processing.
+          </Alert>
         </Stack>
       </DialogContent>
       <DialogActions>
-        <Button
-          variant="contained"
-          onClick={(e) => {
-            confirmationService("ipos", [orderID]);
-            revalidateCallback && revalidateCallback();
-            handleClose();
-          }}
-        >
-          Confirm
-        </Button>
-        <Button variant="contained" onClick={handleClose}>
+        <Button variant="outlined" onClick={handleClose}>
           Cancel
         </Button>
+        <Button variant="contained" color="primary" onClick={handleConfirm}>
+          Confirm Order
+        </Button>
       </DialogActions>
     </Dialog>
   );
 }
 
+interface CancelIpoDialogProps {
+  open: boolean;
+  handleClose: () => void;
+  orderID: number;
+  revalidateCallback?: () => void;
+}
+
 function CancelIpoDialog({
   open,
   handleClose,
   orderID,
   revalidateCallback,
-}: {
-  open: boolean;
-  handleClose: () => void;
-  orderID: number;
-  revalidateCallback?: () => void;
-}) {
-  const [reason, setRoason] = useState<string>("");
+}: CancelIpoDialogProps): React.ReactElement {
+  const [reason, setReason] = 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;
+    }
+    try {
+      await cancellationService("ipos", orderID, reason);
+      handleAddMessage({
+        message: "IPO cancelled successfully",
+        severity: "success",
+      });
+      revalidateCallback && revalidateCallback();
+      handleClose();
+    } catch (error) {
+      handleAddMessage({
+        message: "Failed to cancel IPO",
+        severity: "error",
+      });
+    }
+  };
+
   return (
-    <form>
-      <Dialog open={open}>
-        <DialogTitle>Cancel Return</DialogTitle>
-        <DialogContent>
-          <Stack spacing={2}>
-            <Typography>
-              Are you sure you want to cancel this return?
-            </Typography>
-            <List>
-              <ListItem>
-                By cancelling this return order you will update it's status from
-                requested to cancelled
-              </ListItem>
-              <ListItem>Please provide a reason for the cancellation</ListItem>
-              <ListItem>
-                The customer will be notified about the cancellation and of the
-                reason for the cancellation
-              </ListItem>
-            </List>
-            <TextField
-              label="Cancellation reason"
-              name="reason"
-              multiline
-              rows={4}
-              fullWidth
-              variant="outlined"
-              value={reason}
-              onChange={(e) => setRoason(e.target.value)}
-              placeholder="Please provide a reason for the cancellation"
-              error={!!reasonError}
-              helperText={reasonError}
-            />
-          </Stack>
-        </DialogContent>
-        <DialogActions>
-          <Button
-            variant="contained"
-            onClick={(e) => {
-              if (reason.length < 5) {
-                setReasonError("Please provide a reason for the cancellation");
-                return;
-              }
-              cancellationService("ipos", orderID, reason);
-              revalidateCallback && revalidateCallback();
-              handleClose();
-            }}
-          >
-            Yes
-          </Button>
-          <Button variant="contained" onClick={handleClose}>
-            No
-          </Button>
-        </DialogActions>
-      </Dialog>
-    </form>
+    <Dialog open={open}>
+      <DialogTitle>Cancel Return</DialogTitle>
+      <DialogContent>
+        <Stack spacing={2}>
+          <Typography>Are you sure you want to cancel this return?</Typography>
+          <List>
+            <ListItem>
+              By cancelling this return order you will update it's status from
+              requested to cancelled
+            </ListItem>
+            <ListItem>Please provide a reason for the cancellation</ListItem>
+            <ListItem>
+              The customer will be notified about the cancellation and of the
+              reason for the cancellation
+            </ListItem>
+          </List>
+          <TextField
+            label="Cancellation reason"
+            name="reason"
+            multiline
+            rows={4}
+            fullWidth
+            variant="outlined"
+            value={reason}
+            onChange={(e) => setReason(e.target.value)}
+            placeholder="Please provide a reason for the cancellation"
+            error={!!reasonError}
+            helperText={reasonError}
+          />
+        </Stack>
+      </DialogContent>
+      <DialogActions>
+        <Button variant="outlined" onClick={handleClose}>
+          Cancel
+        </Button>
+        <Button variant="contained" color="error" onClick={handleCancel}>
+          Confirm Cancellation
+        </Button>
+      </DialogActions>
+    </Dialog>
   );
 }
 
 export default function TextualManageIPOForm({
   data,
   sx,
-  // revalidates the selectedOpo from the database
   revalidateCallback,
   handleClose,
   role,
-}: ManageIpoFormProps) {
-  // TODO bind to id of IPO
-  const [formState, formAction] = useFormState(updateIpoAction, INITIAL_STATE);
+}: ManageIpoFormProps): React.ReactElement {
+  const [formState, formAction] = useFormState(
+    (prevState: any, formData: FormData) =>
+      updateIpoAction(data.id, prevState, formData),
+    INITIAL_STATE
+  );
+
+  const { handleAddMessage } = useSnackbar();
 
   const [items, setItems] = useState<IpoItem[]>(
     data.items.data ? data.items.data : []
@@ -197,6 +223,29 @@ export default function TextualManageIPOForm({
     "reports",
   ];
 
+  useEffect(() => {
+    if (formState?.message) {
+      handleAddMessage({
+        message: formState.message,
+        severity: formState.severity || "error",
+      });
+
+      if (formState.severity === "success") {
+        revalidateCallback && revalidateCallback();
+        handleClose && handleClose();
+      }
+    }
+  }, [formState?.message]);
+
+  useEffect(() => {
+    if (formState?.strapiErrors) {
+      handleAddMessage({
+        message: formState.strapiErrors.message || "Error updating IPO",
+        severity: "error",
+      });
+    }
+  }, [formState?.strapiErrors]);
+
   const parseItems = (items: IpoItem[]) => {
     return items.map((item) => {
       return {
@@ -260,8 +309,6 @@ export default function TextualManageIPOForm({
     setItems(newItems);
   };
 
-  const { handleAddMessage } = useSnackbar();
-
   useEffect(() => {
     if (formState?.message === "Ipo Updated") {
       handleAddMessage({

package/src/data/actions/e-commerce/enduser/profile-actions.ts

@@ -0,0 +1,47 @@
+"use server";
+
+import { mutateData } from "../../../services/mutate-data";
+import { flattenAttributes } from "../../../../lib/utils";
+import { parseFormData } from "../../../../lib/parseFormData";
+
+export async function updateEnduserProfileAction(
+  id: number,
+  prevState: any,
+  formData: FormData
+) {
+  const parsedFormData = parseFormData(formData);
+
+  const responseData = await mutateData(
+    "PUT",
+    `/api/enduser-profiles/${id}`,
+    parsedFormData
+  );
+
+  if (!responseData) {
+    return {
+      ...prevState,
+      severity: "error",
+      strapiErrors: null,
+      message: "Ops! Something went wrong. Please try again.",
+    };
+  }
+
+  if (responseData.error) {
+    return {
+      ...prevState,
+      severity: "error",
+      strapiErrors: responseData.error,
+      message: "Failed to update profile.",
+    };
+  }
+
+  const flattenedData = flattenAttributes(responseData);
+
+  return {
+    ...prevState,
+    severity: "success",
+    message: "Profile Updated Successfully",
+    data: flattenedData,
+    strapiErrors: null,
+  };
+}

package/src/data/actions/logistics/dispatcher/profile-actions.ts

@@ -5,24 +5,21 @@ import { flattenAttributes } from "../../../../lib/utils";
 import { parseFormData } from "../../../../lib/parseFormData";
 
 export async function updateDispatcherProfileAction(
+  id: number,
   prevState: any,
   formData: FormData
 ) {
-  const rawFormData = Object.fromEntries(formData);
-
   const parsedFormData = parseFormData(formData);
 
-  const id = rawFormData.id;
-
   const responseData = await mutateData(
     "PUT",
     `/api/dispatcher-profiles/${id}`,
     parsedFormData
   );
-
   if (!responseData) {
     return {
       ...prevState,
+      severity: "error",
       strapiErrors: null,
       message: "Ops! Something went wrong. Please try again.",
     };
@@ -31,16 +28,17 @@ export async function updateDispatcherProfileAction(
   if (responseData.error) {
     return {
       ...prevState,
+      severity: "error",
       strapiErrors: responseData.error,
-      message: "Failed to Register.",
+      message: "Failed to update profile.",
     };
   }
 
   const flattenedData = flattenAttributes(responseData);
-
   return {
     ...prevState,
-    message: "Profile Updated",
+    severity: "success",
+    message: "Profile Updated Successfully",
     data: flattenedData,
     strapiErrors: null,
   };

package/src/data/actions/logistics/ipo/createIPOAction.ts

@@ -6,13 +6,12 @@ import { parseFormData } from "../../../../lib/parseFormData";
 // import { format } from "date-fns";
 import dayjs from "dayjs";
 export async function createIPOAction(prevState: any, formData: FormData) {
-  const rawFormData = Object.fromEntries(formData);
-
   const parsedFormData = parseFormData(formData);
 
   if (!parsedFormData.data.order_date) {
     return {
       ...prevState,
+      severity: "error",
       strapiErrors: null,
       message: "Please select an Order Date.",
     };
@@ -23,7 +22,6 @@ export async function createIPOAction(prevState: any, formData: FormData) {
       vendor_profile: parsedFormData.data.vendors,
       customer_reference: parsedFormData.data.customer_reference,
       order_date: dayjs(parsedFormData.data.order_date).format("YYYY-MM-DD"),
-      // format(parsedFormData.data.order_date, "yyyy-MM-dd"),
       items: parsedFormData.data.ipo_items,
     },
   };
@@ -31,31 +29,31 @@ export async function createIPOAction(prevState: any, formData: FormData) {
   const items = JSON.parse(parsedFormData.data.ipo_items);
 
   if (items.length === 0) {
-    console.log("No items in IPO");
     return {
       ...prevState,
+      severity: "error",
       strapiErrors: null,
       message: "Please add items to the IPO.",
     };
   }
 
-  console.log("ipoData", ipoData);
-
   const responseData = await mutateData("POST", `/api/ipos`, ipoData);
 
   if (!responseData) {
     return {
       ...prevState,
+      severity: "error",
       strapiErrors: null,
-      message: "Ops! Something went wrong. Please try again.",
+      message: "Failed to create IPO. Please try again.",
     };
   }
 
   if (responseData.error) {
     return {
       ...prevState,
+      severity: "error",
       strapiErrors: responseData.error,
-      message: "Failed to Create IPO.",
+      message: "Failed to create IPO.",
     };
   }
 
@@ -63,7 +61,8 @@ export async function createIPOAction(prevState: any, formData: FormData) {
 
   return {
     ...prevState,
-    message: "New IPO Created",
+    severity: "success",
+    message: "IPO Created Successfully",
     data: flattenedData,
     strapiErrors: null,
   };

package/src/data/actions/logistics/ipo/updateIpoAction.ts

@@ -4,30 +4,34 @@ import { mutateData } from "../../../services/mutate-data";
 import { flattenAttributes } from "../../../../lib/utils";
 import { parseFormData } from "../../../../lib/parseFormData";
 
-export async function updateIpoAction(prevState: any, formData: FormData) {
-  const rawFormData = Object.fromEntries(formData);
-
+export async function updateIpoAction(
+  id: number,
+  prevState: any,
+  formData: FormData
+) {
   const parsedFormData = parseFormData(formData);
 
   const responseData = await mutateData(
     "PUT",
-    `/api/ipos/${rawFormData.id}`,
+    `/api/ipos/${id}`,
     parsedFormData
   );
 
   if (!responseData) {
     return {
       ...prevState,
+      severity: "error",
       strapiErrors: null,
-      message: "Ops! Something went wrong. Please try again.",
+      message: "Failed to update IPO. Please try again.",
     };
   }
 
   if (responseData.error) {
     return {
       ...prevState,
+      severity: "error",
       strapiErrors: responseData.error,
-      message: "Failed to Update Ipo.",
+      message: "Failed to update IPO.",
     };
   }
 
@@ -35,7 +39,8 @@ export async function updateIpoAction(prevState: any, formData: FormData) {
 
   return {
     ...prevState,
-    message: "Ipo Updated",
+    severity: "success",
+    message: "IPO Updated Successfully",
     data: flattenedData,
     strapiErrors: null,
   };

package/src/index.ts

@@ -289,6 +289,9 @@ export { default as ReportsWarning } from "./components/logistics/report/Reports
 export { default as DispatcherProfileDisplay } from "./components/logistics/dispatcher/DispatcherProfileDisplay";
 export { default as DispatcherProfileEditForm } from "./components/logistics/dispatcher/DispatcherProfileEditForm";
 
+export { default as EnduserProfileEditForm } from "./components/e-commerce/enduser/EnduserProfileEditForm";
+export { default as EnduserProfileDisplay } from "./components/e-commerce/enduser/EnduserProfileDisplay";
+
 export { updateDispatcherProfileAction as updateDispatcherProfileAction } from "./data/actions/logistics/dispatcher/profile-actions";
 export { getExtendedDispatcherMeLoader as getExtendedDispatcherMeLoader } from "./data/services/logistics/dispatcher/get-dispatcher-me-loader";
 export { getDispatcherMeLoader as getDispatcherMeLoader } from "./data/services/logistics/dispatcher/get-dispatcher-me-loader";

package/src/types/e-commerce/enduser/types.ts

@@ -0,0 +1,15 @@
+import { BusinessCredentialsWithJSONProps } from "../BusinessCredentialsProps";
+import { AddressProps } from "../../AddressProps";
+
+export interface EnduserProfileProps {
+  id: string;
+  uuid: string;
+  enduser_number: string;
+  first_name: string;
+  last_name: string;
+  email: string;
+  phone: string;
+  private_address: AddressProps;
+  company_address: AddressProps;
+  business_credentials: BusinessCredentialsWithJSONProps;
+}