umwd-components 0.1.628 → 0.1.630

package/dist/types/components/e-commerce/iro/IroItemUpdater.d.ts

@@ -0,0 +1,4 @@
+import React from "react";
+import { ItemUpdaterProps } from "../../../types/logistics/Ipo";
+declare function IroItemUpdater({ item, index, handleUpdateQuantity, image, revalidateCallback, }: ItemUpdaterProps): React.JSX.Element;
+export default IroItemUpdater;

package/dist/types/components/e-commerce/iro/IroStatusIndicator.d.ts

@@ -1,8 +1,8 @@
 import React from "react";
-import { IpoStatus } from "../../../types/logistics/Ipo";
+import { IroStatus } from "../../../types/e-commerce/iro/types";
 import { Role } from "../../../types/auth/Role";
 interface IroStatusIndicatorProps {
-    status: IpoStatus;
+    status: IroStatus;
     provider_id?: string;
     role?: Role;
 }

package/dist/types/index.d.ts

@@ -202,10 +202,10 @@ export { createIroAction as createIroAction } from "./data/actions/e-commerce/ir
 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 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";
+export { default as TextualManageIroForm } from "./components/e-commerce/iro/TextualManageIROForm";

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

@@ -23,7 +23,7 @@ export interface IroItem {
 }
 export interface NewIroItem {
     line_item_number?: string;
-    product?: Product | number | ProductName;
+    product?: Product | number;
     reason: ReturnReason;
     other_reason?: string;
     returned_quantity: number;

package/package.json

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

package/src/components/common/markdown/MarkdownEditor.tsx

@@ -52,6 +52,7 @@ export default function MarkdownEditor({
         <Paper
           sx={{
             p: 2,
+            background: "none",
             border: `1px solid ${theme.palette.primary.main}`,
             height: "100%",
           }}

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

@@ -16,30 +16,41 @@ import DeleteIcon from "@mui/icons-material/Delete";
 import { useTheme } from "@mui/material/styles";
 import { NewIroItem } from "../../../types/e-commerce/iro/types";
 import { ReturnReason } from "../../../types/e-commerce/iro/types";
+import next from "next";
 
 const getWeek = (date: Date) => {
   return dayjs(date).isoWeek();
 };
 
+interface newItem {
+  product: ProductName | null;
+  returned_quantity: number;
+  reason: ReturnReason;
+  other_reason: string;
+}
+
 export function IROItemFields({ productsArr }: { productsArr: ProductName[] }) {
-  const [items, setItems] = useState<NewIroItem[]>([]);
+  const [items, setItems] = useState<newItem[]>([]);
 
   const [nextProductName, setNextProductName] = useState<ProductName | null>(
     null
   );
+
   const [nextAmount, setNextAmount] = useState<number>(0);
   const [nextReason, setNextReason] = useState<ReturnReason>("damaged");
   const [nextOtherReason, setNextOtherReason] = useState<string>("");
 
   const [selectedProduct, setSelectedProduct] = useState<number[]>([]);
 
+  const [showCustomReason, setShowCustomReason] = useState(false);
+
   const handleAddItem = () => {
-    if (nextProductName === null || nextAmount === null) {
+    if (nextAmount === null) {
       console.log("nextProductName or nextAmount is null");
       return;
     }
-    const newItem: NewIroItem = {
-      product: nextProductName.id,
+    const newItem = {
+      product: nextProductName,
       returned_quantity: nextAmount,
       reason: nextReason,
       other_reason: nextOtherReason,
@@ -68,15 +79,11 @@ export function IROItemFields({ productsArr }: { productsArr: ProductName[] }) {
     other_reason: string;
   };
 
-  const parseItems = (items: NewIroItem[]): parsedIroItem[] => {
+  const parseItems = (items: newItem[]): parsedIroItem[] => {
     return items.map((item, index) => {
       return {
         line_item_number: `${index + 1}.0.0`,
-        product: item.product
-          ? typeof item.product === "number"
-            ? item.product
-            : item.product.id
-          : 0,
+        product: item.product?.id || 0,
         returned_quantity: item.returned_quantity,
         reason: nextReason,
         other_reason: nextOtherReason,
@@ -99,8 +106,9 @@ export function IROItemFields({ productsArr }: { productsArr: ProductName[] }) {
               Line Item Number
             </TableCell>
 
-            <TableCell sx={[{ width: "70%" }]}>Product Number</TableCell>
+            <TableCell sx={[{ width: "35%" }]}>Product Number</TableCell>
             <TableCell sx={[{ width: "15%" }]}>Amount</TableCell>
+            <TableCell sx={[{ width: "35%" }]}>Reason</TableCell>
 
             <TableCell sx={[]}></TableCell>
           </TableRow>
@@ -110,15 +118,19 @@ export function IROItemFields({ productsArr }: { productsArr: ProductName[] }) {
             return (
               <TableRow key={index}>
                 <TableCell sx={[{ width: "15%" }]}>{index + 1}.0.0</TableCell>
-                <TableCell sx={[{ width: "70%" }]}>
+                <TableCell sx={[{ width: "35%" }]}>
                   {typeof item.product === "object"
-                    ? item.product.product_number
+                    ? item.product?.product_number
                     : item.product}{" "}
-                  | {typeof item.product === "object" ? item.product.title : ""}
+                  |{" "}
+                  {typeof item.product === "object" ? item.product?.title : ""}
                 </TableCell>
                 <TableCell sx={{ width: "15%" }}>
                   {item.returned_quantity}
                 </TableCell>
+                <TableCell sx={{ width: "35%" }}>
+                  {item.reason === "other" ? item.other_reason : item.reason}
+                </TableCell>
 
                 <TableCell align="right" sx={{ width: "5%" }}>
                   <IconButton onClick={() => handleDeleteItem(index)}>
@@ -179,6 +191,42 @@ export function IROItemFields({ productsArr }: { productsArr: ProductName[] }) {
                 helperText={formErrors.amount} */
           sx={{ width: "15%" }}
         ></TextField>
+        <TextField
+          value={nextReason}
+          select
+          SelectProps={{
+            native: true,
+          }}
+          variant="outlined"
+          fullWidth={!(nextReason === "other")}
+          sx={{ minWidth: "25%" }}
+          onChange={(e) => {
+            const reason = e.target.value;
+            if (reason === "other") {
+              setShowCustomReason(true);
+            } else {
+              setShowCustomReason(false);
+            }
+            setNextReason(e.target.value as ReturnReason);
+          }}
+        >
+          <option value="damaged">Damaged</option>
+          <option value="not_as_described">Not as described</option>
+          <option value="wrong_item">Wrong item</option>
+          <option value="other">Other</option>
+        </TextField>
+        {showCustomReason && (
+          <TextField
+            value={nextOtherReason}
+            label="Custom reason"
+            variant="outlined"
+            fullWidth
+            onChange={(e) => {
+              const customReason = e.target.value;
+              setNextOtherReason(customReason);
+            }}
+          />
+        )}
 
         <IconButton onClick={handleAddItem}>
           <AddIcon />

package/src/components/e-commerce/iro/{IROItemUpdater.tsx → IroItemUpdater.tsx}

@@ -13,7 +13,7 @@ import { Report } from "../../../types/logistics/Report";
 import ReportMakingComponent from "../../logistics/report/ReportMakingComponent";
 import ReportsDisplay from "../../logistics/report/ReportsDisplay";
 
-function ItemUpdater({
+function IroItemUpdater({
   item,
   index,
   handleUpdateQuantity,
@@ -112,7 +112,7 @@ function ItemUpdater({
                 type="registered"
                 minValue={-(received_quantity + registered_bad_quantity)}
                 maxValue={received_quantity}
-                related={[{ id: item.id, __type: "api::logistics.ipo-item" }]}
+                related={[{ id: item.id, __type: "api::e-commerce.iro-item" }]}
                 revalidateCallback={revalidateCallback}
               />
             </Stack>
@@ -137,4 +137,4 @@ function ItemUpdater({
   );
 }
 
-export default ItemUpdater;
+export default IroItemUpdater;

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

@@ -4,49 +4,50 @@ import React from "react";
 
 import Chip from "@mui/material/Chip";
 
-import { IpoStatus } from "../../../types/logistics/Ipo";
+import { IroStatus } from "../../../types/e-commerce/iro/types";
 import { Role } from "../../../types/auth/Role";
 
 interface IroStatusIndicatorProps {
-  status: IpoStatus;
+  status: IroStatus;
   provider_id?: string;
   role?: Role;
 }
 
+// TODO update colors and statusses
 const statusColorArray: {
-  status: IpoStatus;
+  status: IroStatus;
   color: "warning" | "info" | "success" | "error" | "default";
 }[] = [
-  { status: "placed", color: "info" },
-  { status: "ordered", color: "info" },
+  { status: "requested", color: "info" },
+  { status: "returning", color: "info" },
   { status: "logistics_operator_process", color: "info" },
-  { status: "released_on_stock", color: "info" },
+  { status: "finalising_process", color: "info" },
   { status: "done", color: "success" },
   { status: "cancelled", color: "error" },
   { status: null, color: "default" },
 ];
 
 const enduserStatusColorArray: {
-  status: IpoStatus;
+  status: IroStatus;
   color: "warning" | "info" | "success" | "error" | "default";
 }[] = [
-  { status: "placed", color: "warning" },
-  { status: "ordered", color: "info" },
+  { status: "requested", color: "warning" },
+  { status: "returning", color: "info" },
   { status: "logistics_operator_process", color: "info" },
-  { status: "released_on_stock", color: "info" },
+  { status: "finalising_process", color: "warning" },
   { status: "done", color: "success" },
   { status: "cancelled", color: "error" },
   { status: null, color: "default" },
 ];
 
 const dispatcherStatusColorArray: {
-  status: IpoStatus;
+  status: IroStatus;
   color: "warning" | "info" | "success" | "error" | "default";
 }[] = [
-  { status: "placed", color: "info" },
-  { status: "ordered", color: "warning" },
+  { status: "requested", color: "info" },
+  { status: "returning", color: "warning" },
   { status: "logistics_operator_process", color: "info" },
-  { status: "released_on_stock", color: "info" },
+  { status: "finalising_process", color: "info" },
   { status: "done", color: "success" },
   { status: "cancelled", color: "error" },
   { status: null, color: "default" },

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

@@ -3,7 +3,7 @@ import { useFormState } from "react-dom";
 import { updateIpoAction } from "../../../data/actions/logistics/ipo/updateIpoAction";
 import { UploadBase64MediaForm } from "../../../components/common/media/UploadBase64MediaForm";
 import downloadBase64File from "../../../data/loaders/common/media/downloadBase64File";
-import ItemUpdater from "./IROItemUpdater";
+import ItemUpdater from "./IroItemUpdater";
 import ItemDisplay from "./IroItemDisplay";
 import {
   IroItem,
@@ -152,7 +152,7 @@ export default function ManageIROForm({
   const [formState, formAction] = useFormState(updateIpoAction, INITIAL_STATE);
 
   const [items, setItems] = useState<IroItem[]>(
-    data.items.data ? data.items.data : []
+    data.iro_items.data ? data.iro_items.data : []
   );
   const [confirmDialogOpen, setConfirmDialogOpen] = useState(false);
 
@@ -403,8 +403,8 @@ export default function ManageIROForm({
                * should be within the form, thats why the form spans two grid items
                * */}
               <input name="id" type="hidden" value={data.id} />
-              {data?.items?.data &&
-                data.items.data.map((item: IroItem, index: number) => {
+              {data?.iro_items?.data &&
+                data.iro_items.data.map((item: IroItem, index: number) => {
                   console.log("item", item);
                   return (
                     <Paper sx={{ p: 2, mb: 2 }} key={index}>

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

@@ -155,7 +155,7 @@ export default function TextualManageIROForm({
   const [formState, formAction] = useFormState(updateIroAction, INITIAL_STATE);
 
   const [items, setItems] = useState<IroItem[]>(
-    data.items.data ? data.items.data : []
+    data.iro_items.data ? data.iro_items.data : []
   );
 
   const [confirmDialogOpen, setConfirmDialogOpen] = useState(false);
@@ -238,8 +238,8 @@ export default function TextualManageIROForm({
   }, [formState]);
 
   useEffect(() => {
-    if (data.items?.data) {
-      setItems(data.items.data ? data.items.data : []);
+    if (data.iro_items?.data) {
+      setItems(data.iro_items.data ? data.iro_items.data : []);
     }
   }, [data]);
 
@@ -260,10 +260,10 @@ export default function TextualManageIROForm({
             >
               <Stack spacing={2}>
                 <Typography variant="h3" component={"h1"}>
-                  Management Inbound Purchase Order
+                  Management Inbound Return
                 </Typography>
                 <Typography variant="body1">
-                  Manage arrival, registration and recieval of purchase order
+                  Manage arrival, registration and release of return
                 </Typography>
               </Stack>
               <NoteTakingComponent
@@ -281,21 +281,21 @@ export default function TextualManageIROForm({
 
             <Stack direction="row" spacing={2}>
               <Typography variant="body1" width={"250px"}>
-                Purchase Order Number
+                Return Number
               </Typography>
               <Typography variant="body2">{data.return_number}</Typography>
             </Stack>
 
-            <Stack direction="row" spacing={2}>
+            {/* <Stack direction="row" spacing={2}>
               <Typography variant="body1" width={"250px"}>
                 Custom reference
               </Typography>
-              {/* <Typography variant="body2">{data.custom_reference}</Typography> */}
-            </Stack>
+               <Typography variant="body2">{data.custom_reference}</Typography> 
+            </Stack> */}
 
             <Stack direction="row" spacing={2}>
               <Typography variant="body1" width={"250px"}>
-                Order Date
+                Return Date
               </Typography>
 
               <Typography variant="body2">{data.return_date}</Typography>
@@ -303,16 +303,16 @@ export default function TextualManageIROForm({
 
             <Stack direction="row" spacing={2}>
               <Typography variant="body1" width={"250px"}>
-                Supplier
+                Customer
+              </Typography>
+              <Typography variant="body2">
+                {data.customer?.business_credentials?.company_name}
               </Typography>
-              {/* <Typography variant="body2">
-                {data.vendor_profile?.business_credentials?.company_name}
-              </Typography> */}
             </Stack>
 
             <Stack direction="row" spacing={2}>
               <Typography variant="body1" width={"250px"}>
-                Order Status
+                Return Status
               </Typography>
               <Typography variant="body2" width={"250px"}>
                 {data.status}

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

@@ -13,14 +13,19 @@ export async function createIroAction(prevState: any, formData: FormData) {
 
   const parsedFormData = parseFormData(formData);
 
+  if (parsedFormData.data.iro_items) {
+    parsedFormData.data.iro_items = JSON.parse(parsedFormData.data.iro_items);
+  }
+
   console.log(parsedFormData);
-  /* if (parsedFormData.iro_items.length === 0) {
+
+  if (parsedFormData.data.iro_items.length === 0) {
     return {
       ...prevState,
       strapiErrors: null,
-      message: "Ops! Something went wrong. Please try again.",
+      message: "Please add at least one item to the Iro.",
     };
-  }} */
+  }
 
   const responseData = await mutateData(
     "POST",

package/src/index.ts

@@ -313,10 +313,10 @@ export { createIroAction as createIroAction } from "./data/actions/e-commerce/ir
 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 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";
+export { default as TextualManageIroForm } from "./components/e-commerce/iro/TextualManageIROForm";

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

@@ -28,7 +28,7 @@ export interface IroItem {
 
 export interface NewIroItem {
   line_item_number?: string;
-  product?: Product | number | ProductName;
+  product?: Product | number;
   reason: ReturnReason;
   other_reason?: string;
   returned_quantity: number;

package/dist/types/components/e-commerce/iro/IROItemUpdater.d.ts

@@ -1,4 +0,0 @@
-import React from "react";
-import { ItemUpdaterProps } from "../../../types/logistics/Ipo";
-declare function ItemUpdater({ item, index, handleUpdateQuantity, image, revalidateCallback, }: ItemUpdaterProps): React.JSX.Element;
-export default ItemUpdater;