umwd-components 0.1.701 → 0.1.703

package/package.json

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

package/src/components/e-commerce/customer/CustomerProfileDisplay.tsx

@@ -214,7 +214,7 @@ export default function CustomerProfileDisplay({
                     <TableCell align="right">
                       {isCustomer ? (
                         <StyledLink
-                          href={`/user/orders?selectedOrder=${order.id}`}
+                          href={`/user/orders?selectedOpoId=${order.id}`}
                           target="_self"
                         >
                           <Button variant="contained" size="small">
@@ -223,7 +223,7 @@ export default function CustomerProfileDisplay({
                         </StyledLink>
                       ) : (
                         <StyledLink
-                          href={`/dashboard/admin/e-commerce/opos?selectedOrder=${order.id}`}
+                          href={`/dashboard/admin/e-commerce/opos?selectedOpoId=${order.id}`}
                           target="_self"
                         >
                           <Button variant="contained" size="small">
@@ -276,7 +276,7 @@ export default function CustomerProfileDisplay({
                     <TableCell align="right">
                       {isCustomer ? (
                         <StyledLink
-                          href={`/user/returns/selectedIro=${iro.id}`}
+                          href={`/user/returns/selectedIroId=${iro.id}`}
                           target="_self"
                         >
                           <Button variant="contained" size="small">
@@ -285,7 +285,7 @@ export default function CustomerProfileDisplay({
                         </StyledLink>
                       ) : (
                         <StyledLink
-                          href={`/dashboard/admin/e-commerce/iros?selectedIro=${iro.id}`}
+                          href={`/dashboard/admin/e-commerce/iros?selectedIroId=${iro.id}`}
                           target="_self"
                         >
                           <Button variant="contained" size="small">

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

@@ -32,6 +32,7 @@ export default function OpoDisplay({ opo }: { opo: Opo }) {
              * will show a link to the payment page
              * TODO: In the far future it will be possible to pay with multiple payment
              * methods or in multiple installments
+             * TODO: getSingleOpo does not populate payments yet
              */}
             <TableCell>
               <PaymentStatusIndicator
@@ -42,7 +43,9 @@ export default function OpoDisplay({ opo }: { opo: Opo }) {
           </TableRow>
         </TableBody>
       </Table>
-      <Typography variant="body1">Contents of the order:</Typography>
+      <Typography variant="body1" sx={{ mt: 2 }}>
+        Contents of the order:
+      </Typography>
       <OpoSummary opo={opo} />
       {/* shiping details*/}
     </>

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

@@ -18,6 +18,12 @@ import { OpoSummaryRow } from "./OpoSummaryRow";
 export function OpoSummary({ opo }: { opo: Opo }) {
   const { opo_items } = opo;
 
+  if (!opo_items) {
+    return <Typography>Loading...</Typography>;
+  }
+
+  console.log("opo_items", opo_items);
+
   return (
     <Box sx={{ p: { xs: 1, md: 2 } }}>
       {opo_items != null ? (
@@ -31,9 +37,10 @@ export function OpoSummary({ opo }: { opo: Opo }) {
             </TableRow>
           </TableHead>
           <TableBody>
-            {opo_items.map((item: OpoItem) => (
-              <OpoSummaryRow key={item.id} data={item} />
-            ))}
+            {opo_items?.data &&
+              opo_items.data.map((item: OpoItem) => (
+                <OpoSummaryRow key={item.id} data={item} />
+              ))}
           </TableBody>
           <TableFooter>
             <TableRow>

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

@@ -15,8 +15,14 @@ export function OpoSummaryRow({ data }: OpoSummaryRowProps) {
     <TableRow>
       <TableCell>{ordered_quantity}</TableCell>
       <TableCell>{product?.title}</TableCell>
-      <TableCell>€ {product?.price?.price}</TableCell>
-      <TableCell>€ {product?.price?.price_incl_vat}</TableCell>
+      <TableCell>
+        {product?.price?.price ? `€ ${product.price.price}` : "no information"}
+      </TableCell>
+      <TableCell>
+        {product?.price?.price_incl_vat
+          ? `€ ${product.price.price_incl_vat}`
+          : "no information"}
+      </TableCell>
     </TableRow>
   );
 }

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

@@ -4,6 +4,7 @@ import qs from "qs";
 import { fetchData } from "../loaders";
 import { flattenAttributes, getStrapiURL } from "../../../lib/utils";
 import { unstable_noStore as noStore } from "next/cache";
+import Price from "@/components/e-commerce/products/Price";
 
 const baseUrl = getStrapiURL();
 
@@ -18,6 +19,7 @@ async function getSingleOpo(id: number) {
         populate: {
           product: {
             populate: {
+              price: true,
               image: true,
             },
           },