umwd-components 0.1.640 → 0.1.641

package/dist/types/data/services/common/confirmation-service.d.ts

@@ -1 +1,2 @@
-export declare function confirmationService(path: string, ids: number[]): Promise<any>;
+import { InvoiceOverwrites } from "../../../types/e-commerce/invoice/types";
+export declare function confirmationService(path: string, ids: number[], overwrites?: object | InvoiceOverwrites): Promise<any>;

package/dist/types/types/e-commerce/invoice/types.d.ts

@@ -65,3 +65,15 @@ export interface Invoice {
     customer?: number;
     comments?: string;
 }
+export interface InvoiceOverwrites {
+    lines?: {
+        quantity?: number;
+        vat_rate?: number;
+        price_excl_vat?: number;
+        price_incl_vat?: number;
+    }[];
+    customer_internal_reference?: string;
+    total_excl_vat?: number;
+    VAT_total?: number;
+    total_incl_vat?: number;
+}

package/package.json

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

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

@@ -37,6 +37,8 @@ import {
   List,
   ListItem,
   TextField,
+  DialogContentText,
+  CircularProgress,
 } from "@mui/material";
 import NumbersIcon from "@mui/icons-material/Numbers";
 import AssignmentReturnIcon from "@mui/icons-material/AssignmentReturn";
@@ -45,6 +47,11 @@ import BusinessIcon from "@mui/icons-material/Business";
 import DescriptionIcon from "@mui/icons-material/Description";
 import UpdateIcon from "@mui/icons-material/Update";
 import { IroStatusIndicator } from "./IroStatusIndicator";
+import { InvoiceOverwrites } from "../../../types/e-commerce/invoice/types";
+import { Iro } from "../../../types/e-commerce/iro/types";
+import { queryAllProducts } from "../../../data/loaders/e-commerce/queryAllProducts";
+import qs from "qs";
+import { Product } from "../../../types/e-commerce/product/types";
 
 const INITIAL_STATE = {
   zodErrors: null,
@@ -53,18 +60,305 @@ const INITIAL_STATE = {
   message: null,
 };
 
+function OverwritesDialog({
+  open,
+  handleClose,
+  overwrites,
+  setOverwrites,
+  iro,
+}: {
+  open: boolean;
+  handleClose: () => void;
+  overwrites: InvoiceOverwrites;
+  setOverwrites: (overwrites: InvoiceOverwrites) => void;
+  iro: Iro;
+}) {
+  const [loading, setLoading] = useState(false);
+
+  // Initialize overwrites values when dialog opens
+  useEffect(() => {
+    const fetchProducts = async () => {
+      setLoading(true);
+      const query = qs.stringify(
+        {
+          filters: {
+            product_number: {
+              $in: iro.iro_items.data.map(
+                (item) => item.product?.product_number?.replace(/^r-/, "") || ""
+              ),
+            },
+          },
+          populate: {
+            price: true,
+          },
+        },
+        { encodeValuesOnly: true }
+      );
+      const correspondingProductsData = await queryAllProducts(query);
+      const correspondingProducts = correspondingProductsData.data.map(
+        (product: Product) => {
+          return {
+            id: product.id,
+            product_number: product.product_number,
+            price: product.price,
+          };
+        }
+      );
+
+      console.log("correspondingProducts", correspondingProducts);
+      setLoading(false);
+
+      // Calculate totals from the IRO items
+      let totalExclVat = 0;
+      let totalInclVat = 0;
+
+      // Create line overwrites for each item
+      const lineOverwrites = iro.iro_items.data.map((item, index) => {
+        const product = item.product;
+        const correspondingProduct = correspondingProducts.find(
+          (p: Product) =>
+            p.product_number === product?.product_number?.replace(/^r-/, "") ||
+            ""
+        );
+        // For return products, typically the product_number starts with r-
+        // The original product should have the same number without the r-
+        let price_excl_vat = 0;
+        let price_incl_vat = 0;
+        let vat_rate = 0;
+
+        if (correspondingProduct && correspondingProduct.price) {
+          price_excl_vat = correspondingProduct.price.price || 0;
+          price_incl_vat = correspondingProduct.price.price_incl_vat || 0;
+          vat_rate = correspondingProduct.price.vat_rate || 0;
+
+          // Add to totals
+          const itemTotalExclVat = price_excl_vat * item.returned_quantity;
+          const itemTotalInclVat = price_incl_vat * item.returned_quantity;
+
+          totalExclVat += itemTotalExclVat;
+          totalInclVat += itemTotalInclVat;
+        }
+
+        return {
+          vat_rate,
+          price_excl_vat,
+          price_incl_vat,
+          quantity: item.returned_quantity,
+        };
+      });
+
+      // Set the calculated values to the overwrites
+      setOverwrites({
+        customer_internal_reference: iro.customer_reference || "",
+        total_excl_vat: parseFloat(totalExclVat.toFixed(2)),
+        total_incl_vat: parseFloat(totalInclVat.toFixed(2)),
+        lines: lineOverwrites,
+      });
+    };
+
+    if (open && iro?.iro_items?.data?.length > 0) {
+      fetchProducts();
+    }
+  }, [open, iro]);
+
+  return (
+    <Dialog open={open} fullWidth maxWidth="lg">
+      <DialogTitle>Check or overwrite value for the return payment</DialogTitle>
+      <DialogContent>
+        <Stack spacing={2} alignItems="left" sx={{ px: 0 }}>
+          <DialogContentText>
+            This is very important because these values will be used for
+            automated invoice generation
+          </DialogContentText>
+          <DialogContentText variant="h5">Overwrites</DialogContentText>
+          {loading ? (
+            <CircularProgress />
+          ) : (
+            <Stack spacing={2}>
+              <TextField
+                label="Customer internal reference"
+                name="customer_internal_reference"
+                fullWidth
+                variant="outlined"
+                value={overwrites.customer_internal_reference}
+                onChange={(e) =>
+                  setOverwrites({
+                    ...overwrites,
+                    customer_internal_reference: e.target.value,
+                  })
+                }
+              />
+              <TextField
+                label="Total excl. VAT"
+                name="total_excl_vat"
+                type="number"
+                fullWidth
+                variant="outlined"
+                value={overwrites.total_excl_vat}
+                onChange={(e) =>
+                  setOverwrites({
+                    ...overwrites,
+                    total_excl_vat: parseFloat(e.target.value),
+                  })
+                }
+              />
+              <TextField
+                label="Total incl. VAT"
+                name="total_incl_vat"
+                type="number"
+                fullWidth
+                variant="outlined"
+                value={overwrites.total_incl_vat}
+                onChange={(e) =>
+                  setOverwrites({
+                    ...overwrites,
+                    total_incl_vat: parseFloat(e.target.value),
+                  })
+                }
+              />
+            </Stack>
+          )}
+          {iro?.iro_items?.data?.length > 0 && (
+            <>
+              <DialogContentText variant="h5">Items</DialogContentText>
+
+              {iro.iro_items.data.map((item, index) => {
+                return (
+                  <Stack
+                    spacing={2}
+                    direction="row"
+                    alignItems="center"
+                    sx={{ px: 2 }}
+                    key={item.id}
+                  >
+                    <Typography sx={{ minWidth: 100 }}>
+                      {item.line_item_number}
+                    </Typography>
+                    <Typography sx={{ minWidth: 150 }}>
+                      {item.product?.product_number}
+                    </Typography>
+                    <Typography sx={{ minWidth: 200 }}>
+                      {item.product?.title}
+                    </Typography>
+
+                    <TextField
+                      size="small"
+                      label="VAT %"
+                      name="vat_rate"
+                      type="number"
+                      sx={{ width: 100 }}
+                      value={overwrites?.lines?.[index]?.vat_rate ?? ""}
+                      onChange={(e) => {
+                        const newLines = [...(overwrites.lines || [])];
+                        newLines[index] = {
+                          ...newLines[index],
+                          vat_rate: parseFloat(e.target.value),
+                        };
+                        setOverwrites({
+                          ...overwrites,
+                          lines: newLines,
+                        });
+                      }}
+                    />
+
+                    <TextField
+                      size="small"
+                      label="Price excl."
+                      name="price_excl_vat"
+                      type="number"
+                      sx={{ width: 120 }}
+                      value={overwrites?.lines?.[index]?.price_excl_vat ?? ""}
+                      onChange={(e) => {
+                        const newLines = [...(overwrites.lines || [])];
+                        newLines[index] = {
+                          ...newLines[index],
+                          price_excl_vat: parseFloat(e.target.value),
+                        };
+                        setOverwrites({
+                          ...overwrites,
+                          lines: newLines,
+                        });
+                      }}
+                    />
+
+                    <TextField
+                      size="small"
+                      label="Price incl."
+                      name="price_incl_vat"
+                      type="number"
+                      sx={{ width: 120 }}
+                      value={overwrites?.lines?.[index]?.price_incl_vat ?? ""}
+                      onChange={(e) => {
+                        const newLines = [...(overwrites.lines || [])];
+                        newLines[index] = {
+                          ...newLines[index],
+                          price_incl_vat: parseFloat(e.target.value),
+                        };
+                        setOverwrites({
+                          ...overwrites,
+                          lines: newLines,
+                        });
+                      }}
+                    />
+
+                    <TextField
+                      size="small"
+                      label="Qty"
+                      name="quantity"
+                      type="number"
+                      sx={{ width: 80 }}
+                      value={overwrites?.lines?.[index]?.quantity ?? ""}
+                      onChange={(e) => {
+                        const newLines = [...(overwrites.lines || [])];
+                        newLines[index] = {
+                          ...newLines[index],
+                          quantity: parseFloat(e.target.value),
+                        };
+                        setOverwrites({
+                          ...overwrites,
+                          lines: newLines,
+                        });
+                      }}
+                    />
+                  </Stack>
+                );
+              })}
+            </>
+          )}
+        </Stack>
+      </DialogContent>
+      <DialogActions>
+        <Button
+          variant="contained"
+          onClick={(e) => {
+            confirmationService("iros", [iro.id], overwrites);
+            handleClose();
+          }}
+        >
+          Confirm
+        </Button>
+        <Button variant="contained" onClick={handleClose}>
+          Cancel
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+}
+
 function ConfirmFormDialog({
   open,
   handleClose,
   orderID,
   currentStatus,
   revalidateCallback,
+  openOverwritesDialog,
 }: {
   open: boolean;
   handleClose: () => void;
   orderID: number;
   currentStatus: "requested" | "finalising_process";
   revalidateCallback?: () => void;
+  openOverwritesDialog?: () => void;
 }) {
   return (
     <Dialog open={open}>
@@ -83,6 +377,11 @@ function ConfirmFormDialog({
                 ? "By confirming the return you will update it's status from requested to returning"
                 : "By confirming the return you will update it's status from finalising_process to done"}
             </ListItem>
+            {currentStatus === "finalising_process" && (
+              <ListItem>
+                Confirming this order will automatically create an invoice
+              </ListItem>
+            )}
           </List>
           <Typography>Current status: {currentStatus}</Typography>
         </Stack>
@@ -91,9 +390,14 @@ function ConfirmFormDialog({
         <Button
           variant="contained"
           onClick={(e) => {
-            confirmationService("iros", [orderID]);
-            revalidateCallback && revalidateCallback();
-            handleClose();
+            if (currentStatus === "finalising_process") {
+              openOverwritesDialog && openOverwritesDialog();
+              handleClose();
+            } else if (currentStatus === "requested") {
+              confirmationService("iros", [orderID]);
+              revalidateCallback && revalidateCallback();
+              handleClose();
+            }
           }}
         >
           Yes
@@ -196,6 +500,14 @@ export default function TextualManageIROForm({
 
   const [confirmDialogOpen, setConfirmDialogOpen] = useState(false);
   const [cancelDialogOpen, setCancelDialogOpen] = useState(false);
+  const [overwritesDialogOpen, setOverwritesDialogOpen] = useState(false);
+
+  const [overwrites, setOverwrites] = useState<InvoiceOverwrites>({
+    customer_internal_reference: "",
+    total_excl_vat: 0,
+    total_incl_vat: 0,
+    lines: [],
+  });
 
   const [showing, setShowing] = useState<
     ("received" | "registered" | "released" | "reports")[]
@@ -278,6 +590,7 @@ export default function TextualManageIROForm({
   }, [formState]);
 
   useEffect(() => {
+    console.log("data", data);
     if (data.iro_items?.data) {
       setItems(data.iro_items.data ? data.iro_items.data : []);
     }
@@ -455,6 +768,14 @@ export default function TextualManageIROForm({
                     orderID={data.id}
                     currentStatus={data.status}
                     revalidateCallback={revalidateCallback}
+                    openOverwritesDialog={() => setOverwritesDialogOpen(true)}
+                  />
+                  <OverwritesDialog
+                    open={overwritesDialogOpen}
+                    handleClose={() => setOverwritesDialogOpen(false)}
+                    overwrites={overwrites}
+                    setOverwrites={setOverwrites}
+                    iro={data}
                   />
                   <CancelIroDialog
                     open={cancelDialogOpen}

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

@@ -2,9 +2,14 @@
 
 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[]) {
+export async function confirmationService(
+  path: string,
+  ids: number[],
+  overwrites: object | InvoiceOverwrites = {}
+) {
   const authToken = await getAuthToken();
 
   const baseUrl = getStrapiURL();
@@ -13,7 +18,9 @@ export async function confirmationService(path: string, ids: number[]) {
 
   if (!authToken) throw new Error("No auth token found");
 
-  const payload = JSON.stringify({ data: { selectedIds: [...ids] } });
+  const payload = JSON.stringify({
+    data: { selectedIds: [...ids], overwrites },
+  });
 
   console.log("payload", payload);
   console.log("url", url);

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

@@ -69,3 +69,19 @@ export interface Invoice {
   customer?: number;
   comments?: string;
 }
+
+// TODO a copy of this exists in the umwd project, consider moving to a common place
+// TODO consider moving to a common place, this is used in the umwd project as well
+// /cms/api/e-commerce/services/invoice/confirm
+export interface InvoiceOverwrites {
+  lines?: {
+    quantity?: number;
+    vat_rate?: number;
+    price_excl_vat?: number;
+    price_incl_vat?: number;
+  }[];
+  customer_internal_reference?: string;
+  total_excl_vat?: number;
+  VAT_total?: number;
+  total_incl_vat?: number;
+}