umwd-components 0.1.622 → 0.1.624

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

@@ -24,7 +24,7 @@ import Stack from "@mui/material/Stack";
 import Divider from "@mui/material/Divider";
 import Card from "@mui/material/Card";
 import CardContent from "@mui/material/CardContent";
-import { confirmationService } from "../../../data/services/logistics/ipo/confirmation-service";
+import { confirmationService } from "../../../data/services/common/confirmation-service";
 
 const INITIAL_STATE = {
   zodErrors: null,

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

@@ -22,9 +22,7 @@ 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 Card from "@mui/material/Card";
-import CardContent from "@mui/material/CardContent";
-import { confirmationService } from "../../../data/services/logistics/ipo/confirmation-service";
+import { confirmationService } from "../../../data/services/common/confirmation-service";
 import { PreReport } from "../../../types/logistics/Report";
 import { FormControlLabel, Checkbox } from "@mui/material";
 

package/src/data/actions/e-commerce/iro/createIroAction.ts

@@ -0,0 +1,46 @@
+"use server";
+
+import { mutateData } from "../../../services/mutate-data";
+import { flattenAttributes } from "../../../../lib/utils";
+import { parseFormData } from "../../../../lib/parseFormData";
+
+/** INFO
+ * This action is only used by the enduser to create a new Iro with a selected customer and products.
+ * It should not be used by the customer to create an iro
+ */
+export async function createIroAction(prevState: any, formData: FormData) {
+  const rawFormData = Object.fromEntries(formData);
+
+  const parsedFormData = parseFormData(formData);
+
+  const responseData = await mutateData(
+    "POST",
+    `/api/iros/createAdmin`, //TODO create in CMS
+    parsedFormData
+  );
+
+  if (!responseData) {
+    return {
+      ...prevState,
+      strapiErrors: null,
+      message: "Ops! Something went wrong. Please try again.",
+    };
+  }
+
+  if (responseData.error) {
+    return {
+      ...prevState,
+      strapiErrors: responseData.error,
+      message: "Failed to Create Iro.",
+    };
+  }
+
+  const flattenedData = flattenAttributes(responseData);
+
+  return {
+    ...prevState,
+    message: "Iro Created Successfully",
+    data: flattenedData,
+    strapiErrors: null,
+  };
+}

package/src/data/actions/e-commerce/iro/updateIroAction.ts

@@ -0,0 +1,43 @@
+"use server";
+
+import { mutateData } from "../../../services/mutate-data";
+import { flattenAttributes } from "../../../../lib/utils";
+import { parseFormData } from "../../../../lib/parseFormData";
+
+export async function updateIroAction(prevState: any, formData: FormData) {
+  const rawFormData = Object.fromEntries(formData);
+
+  const parsedFormData = parseFormData(formData);
+  console.log("parsedFormData", parsedFormData);
+
+  const responseData = await mutateData(
+    "PUT",
+    `/api/iros/${rawFormData.id}`,
+    parsedFormData
+  );
+
+  if (!responseData) {
+    return {
+      ...prevState,
+      strapiErrors: null,
+      message: "Ops! Something went wrong. Please try again.",
+    };
+  }
+
+  if (responseData.error) {
+    return {
+      ...prevState,
+      strapiErrors: responseData.error,
+      message: "Failed to Update Iro.",
+    };
+  }
+
+  const flattenedData = flattenAttributes(responseData);
+
+  return {
+    ...prevState,
+    message: "Iro Updated",
+    data: flattenedData,
+    strapiErrors: null,
+  };
+}

package/src/data/loaders/e-commerce/getAllOpos.ts

@@ -8,7 +8,7 @@ import { getUserRole } from "../../services/get-user-me-loader";
 
 const baseUrl = getStrapiURL();
 
-export async function getAllOpos(
+async function getAllOpos(
   currentPage: number,
   rowsPerPage: number,
   order: "asc" | "desc",
@@ -73,3 +73,5 @@ export async function getAllOpos(
 
   return await fetchData(url.href);
 }
+
+export { getAllOpos };

package/src/data/loaders/e-commerce/iros/getAllIros.ts

@@ -0,0 +1,64 @@
+"use server";
+
+import qs from "qs";
+import { fetchData } from "../../loaders";
+import { getStrapiURL } from "../../../../lib/utils";
+import { unstable_noStore as noStore } from "next/cache";
+import { getUserRole } from "../../../services/get-user-me-loader";
+
+const baseUrl = getStrapiURL();
+
+async function getAllIros(
+  currentPage: number,
+  rowsPerPage: number,
+  order: "asc" | "desc",
+  orderBy: string,
+  is_archive: boolean[]
+) {
+  noStore();
+
+  const user = await getUserRole();
+  const role = user?.data?.role?.type;
+  const isEnduser = role === "enduser";
+
+  const url = new URL(`/api/iros`, baseUrl);
+
+  url.search = qs.stringify({
+    filters: {
+      is_archive: {
+        $in: is_archive,
+      },
+    },
+    sort: `${orderBy || "id"}:${order || "desc"}`,
+    populate: {
+      iro_items: {
+        populate: {
+          product: {
+            populate: {
+              price: true,
+            },
+          },
+          reports: true,
+        },
+      },
+      customer: isEnduser
+        ? {
+            populate: {
+              company_address: true,
+              delivery_address: true,
+              billing_address: true,
+              business_credentials: true,
+            },
+          }
+        : false,
+    },
+    pagination: {
+      pageSize: rowsPerPage || 10,
+      page: currentPage ? currentPage + 1 : 1, // because table pagination starts at 0 but strapi starts at 1
+    },
+  });
+
+  return await fetchData(url.href);
+}
+
+export { getAllIros };

package/src/data/loaders/e-commerce/iros/getIroModel.ts

@@ -0,0 +1,18 @@
+"use server";
+
+import qs from "qs";
+import { fetchData } from "../../loaders";
+import { flattenAttributes, getStrapiURL } from "../../../../lib/utils";
+import { unstable_noStore as noStore } from "next/cache";
+
+const baseUrl = getStrapiURL();
+
+async function getIroModel() {
+  noStore();
+
+  const url = new URL(`/api/iros/findModel`, baseUrl);
+
+  return await fetchData(url.href);
+}
+
+export { getIroModel };

package/src/data/loaders/e-commerce/iros/getSingleIro.ts

@@ -0,0 +1,47 @@
+"use server";
+
+import qs from "qs";
+import { fetchData } from "../../loaders";
+import { flattenAttributes, getStrapiURL } from "../../../../lib/utils";
+import { unstable_noStore as noStore } from "next/cache";
+
+const baseUrl = getStrapiURL();
+
+async function getSingleIro(id: number) {
+  // noStore();
+
+  const url = new URL(`/api/iros/${id}`, baseUrl);
+
+  url.search = qs.stringify({
+    populate: {
+      iro_items: {
+        populate: {
+          product: {
+            populate: {
+              image: true,
+            },
+          },
+          reports: {
+            populate: {
+              author: true,
+            },
+          },
+        },
+      },
+      customer: {
+        populate: ["business_credentials"],
+      },
+      notes: {
+        populate: {
+          author: {
+            populate: true,
+          },
+        },
+      },
+    },
+  });
+
+  return await fetchData(url.href);
+}
+
+export { getSingleIro };

package/src/data/loaders/e-commerce/iros/queryAllIros.ts

@@ -0,0 +1,26 @@
+"use server";
+
+import qs from "qs";
+import { fetchData } from "../../loaders";
+import { getStrapiURL } from "../../../../lib/utils";
+import { unstable_noStore as noStore } from "next/cache";
+
+const baseUrl = getStrapiURL();
+
+async function queryAllIros(query: string) {
+  noStore();
+
+  const url = new URL(`/api/iros`, baseUrl);
+
+  console.log("query", query);
+
+  url.search = query;
+
+  const res = await fetchData(url.href);
+
+  // console.log("res", res);
+
+  return res;
+}
+
+export { queryAllIros };

package/src/data/loaders/e-commerce-loaders.ts

@@ -127,6 +127,7 @@ async function getAllOrders(
           admin_items: true,
         },
       },
+      return: true,
     },
     pagination: {
       pageSize: rowsPerPage || 10,
@@ -141,5 +142,5 @@ export {
   /* getAllProducts, */
   getCustomerProfile,
   getSingleOrderByUuid,
-  getAllOrders,
+  /* getAllOrders, */
 };

package/src/data/services/{logistics/ipo → common}/confirmation-service.ts

@@ -1,7 +1,7 @@
 "use server";
 
-import { getAuthToken } from "../../get-token";
-import { getStrapiURL } from "../../../../lib/utils"; //"@/lib/utils";
+import { getAuthToken } from "../get-token";
+import { getStrapiURL } from "../../../lib/utils"; //"@/lib/utils";
 
 // TODO move to common services
 export async function confirmationService(path: string, ids: number[]) {

package/src/index.ts

@@ -125,8 +125,9 @@ export {
   /* getAllProducts as getAllProducts, */
   getCustomerProfile as getCustomerProfile,
   getSingleOrderByUuid as getSingleOrderByUuid,
-  getAllOrders as getAllOrders,
+  //getAllOrders as getAllOrders,
 } from "./data/loaders/e-commerce-loaders";
+export { getAllOpos as getAllOpos } from "./data/loaders/e-commerce/getAllOpos";
 export { getSingleCategory as getSingleCategory } from "./data/loaders/e-commerce/getSingleCategory";
 export { getTableProducts as getTableProducts } from "./data/loaders/e-commerce/getTableProducts";
 export { getAllCategoryNames as getAllCategoryNames } from "./data/loaders/e-commerce/getAllCategoryNames";
@@ -227,7 +228,7 @@ export { default as ManageOpoForm } from "./components/e-commerce/opo/ManageOpoF
 export { default as ItemDisplay } from "./components/logistics/ipo/ItemDisplay";
 export { updateOpoAction as updateOpoAction } from "./data/actions/e-commerce/opo/updateOpoAction";
 export { getSingleOpo as getSingleOpo } from "./data/loaders/e-commerce/getSingleOpo";
-export { confirmationService as confirmationService } from "./data/services/logistics/ipo/confirmation-service";
+export { confirmationService as confirmationService } from "./data/services/common/confirmation-service";
 
 export { CreateInvoiceForm as CreateInvoiceForm } from "./components/e-commerce/invoice/CreateInvoiceForm";
 export { createInvoiceAction as createInvoiceAction } from "./data/actions/e-commerce/invoices/createInvoiceAction";
@@ -301,3 +302,21 @@ export { default as TextualOpoItemUpdater } from "./components/e-commerce/opo/Te
 export { default as TextualManageOPOForm } from "./components/e-commerce/opo/TextualManageOpoForm";
 
 export { getShop as getShop } from "./data/loaders/e-commerce/getShop";
+
+export { getAllIros as getAllIros } from "./data/loaders/e-commerce/iros/getAllIros";
+export { getSingleIro as getSingleIro } from "./data/loaders/e-commerce/iros/getSingleIro";
+export { getIroModel as getIroModel } from "./data/loaders/e-commerce/iros/getIroModel";
+export { queryAllIros as queryAllIros } from "./data/loaders/e-commerce/iros/queryAllIros";
+
+/* TODO check if all these IRO stuff is actually being used */
+export { createIroAction as createIroAction } from "./data/actions/e-commerce/iro/createIroAction";
+export { updateIroAction as updateIroAction } from "./data/actions/e-commerce/iro/updateIroAction";
+export { default as IroItemDisplay } from "./components/e-commerce/iro/IroItemDisplay";
+export { IROItemFields as IROItemFields } from "./components/e-commerce/iro/IROItemFields";
+export { default as createIroForm } from "./components/e-commerce/iro/CreateIROForm";
+export { default as IROItemUpdater } from "./components/e-commerce/iro/IROItemUpdater";
+export { default as RmaForm } from "./components/e-commerce/iro/RmaForm";
+export { IroStatusIndicator } from "./components/e-commerce/iro/IroStatusIndicator";
+export { default as ManageIROForm } from "./components/e-commerce/iro/ManageIROForm";
+export { default as TextualIROItemUpdater } from "./components/e-commerce/iro/TextualIROItemUpdater";
+export { default as TextualManageIROForm } from "./components/e-commerce/iro/TextualManageIROForm";

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

@@ -0,0 +1,109 @@
+import { CustomerProfileProps } from "../customer/types";
+import { SxProps, Theme } from "@mui/system";
+import { Product, ProductName } from "../product/types";
+import { StrapiImageProps } from "../../StrapiImageProps";
+import { CustomerLabel } from "../customer/types";
+import { Note } from "../../logistics/Note";
+import { Report, PreReport } from "../../logistics/Report";
+import { Opo } from "../opo/types";
+
+export type ReturnReason =
+  | "damaged"
+  | "not_as_described"
+  | "wrong_item"
+  | "other";
+
+export interface IroItem {
+  id: number;
+  line_item_number?: string;
+  product?: Product;
+  reason: ReturnReason;
+  other_reason?: string;
+  returned_quantity: number;
+  received_quantity: number;
+  registered_quantity: number;
+  released_quantity: number;
+  reports: { data: (Report | PreReport)[] };
+}
+
+export interface NewIroItem {
+  product?: Product;
+  reason: ReturnReason;
+  other_reason?: string;
+  returned_quantity: number;
+}
+
+// TODO
+export type IroStatus =
+  | "requested"
+  | "returning"
+  | "logistics_operator_process"
+  | "finalising_process"
+  | "done"
+  | "cancelled"
+  | null;
+
+export interface Iro {
+  id: number;
+  uuid: string;
+  is_archive: boolean;
+  return_date: string;
+  // confirmation_email_sent: boolean;
+  currency: string;
+  iro_number: string;
+  status: IroStatus;
+  items: { data: IroItem[] };
+  notes: {
+    data: Note[];
+  };
+  customer?: CustomerProfileProps;
+  customer_inhouse_reference: string;
+}
+
+export interface ManageIroFormProps {
+  data: Iro; // for sake of uniformity between forms it's way easier to call this data instead of iro
+  sx?: SxProps<Theme>;
+  revalidateCallback?: () => void;
+  handleClose?: () => void;
+  role?: "enduser" | "dispatcher";
+}
+
+export interface CreateIroFormProps {
+  sx?: SxProps<Theme>;
+  revalidateCallback?: () => void;
+  handleClose?: () => void;
+  customerLabels: CustomerLabel[];
+  productLabels: ProductName[];
+}
+
+export type IroItemUpdaterProps = {
+  item: IroItem;
+  index: number;
+  handleUpdateQuantity: Function;
+  image?: StrapiImageProps;
+  revalidateCallback?: () => void;
+};
+
+export type TextualIroItemUpdaterProps = {
+  item: IroItem;
+  index: number;
+  handleAddReport: (report: PreReport, itemID: number) => void;
+  handleUpdateQuantity: Function;
+  image?: StrapiImageProps;
+  handleRemoveReportAtIndex: (itemID: number, index: number) => void;
+  revalidateCallback?: () => void;
+  showing?: ("received" | "registered" | "released" | "reports")[];
+};
+
+export type IroItemDisplayProps = {
+  item: IroItem;
+  index: number;
+  image?: StrapiImageProps;
+};
+
+export type RMAFormProps = {
+  opo: Opo;
+  sx?: SxProps<Theme>;
+  revalidateCallback?: () => void;
+  handleClose?: () => void;
+};

package/dist/src/data/services/logistics/ipo/confirmation-service.js

@@ -1,7 +0,0 @@
-"use server";
-/*
- * UMWD-Components
- * @copyright Jelle Paulus
- * @license MIT
- */
-import{__awaiter as o,__generator as e,__spreadArray as t,__read as r}from"../../../../../node_modules/tslib/tslib.es6.js";import{getAuthToken as n}from"../../get-token.js";import{getStrapiURL as s}from"../../../../lib/utils.js";function i(i,a){return o(this,void 0,void 0,(function(){var o,c,l,u,d,f;return e(this,(function(e){switch(e.label){case 0:return[4,n()];case 1:if(o=e.sent(),c=s(),l=new URL("api/".concat(i,"/confirm"),c),!o)throw new Error("No auth token found");u=JSON.stringify({data:{selectedIds:t([],r(a),!1)}}),console.log("payload",u),console.log("url",l),e.label=2;case 2:return e.trys.push([2,5,,6]),[4,fetch(l,{method:"PUT",headers:{"Content-Type":"application/json",Authorization:"Bearer ".concat(o)},body:u})];case 3:return d=e.sent(),console.log(d),[4,d.json()];case 4:return[2,e.sent()];case 5:throw f=e.sent(),console.log("error",f),f;case 6:return[2]}}))}))}export{i as confirmationService};