diff --git a/src/components/productChoicesCard/ProductChoicesCard.tsx b/src/components/productChoicesCard/ProductChoicesCard.tsx index 86a4803..0dfe499 100644 --- a/src/components/productChoicesCard/ProductChoicesCard.tsx +++ b/src/components/productChoicesCard/ProductChoicesCard.tsx @@ -45,13 +45,7 @@ export default function ProductChoicesCard({ }} > -
+
{product.name} -
+ {product.extras && ( + + {product.extras.map((o) => ( + {o.name} + ))} + + )} + {product.type === "CartItem" ? product.extrasgroupnew?.map((o) => ( -
+
diff --git a/src/pages/checkout/components/pickupEstimate/Content.tsx b/src/pages/checkout/components/pickupEstimate/Content.tsx index c3caf4b..85dfec1 100644 --- a/src/pages/checkout/components/pickupEstimate/Content.tsx +++ b/src/pages/checkout/components/pickupEstimate/Content.tsx @@ -82,7 +82,7 @@ export default function PickupEstimateContent({ let hour = nextHour; let minute = nextMinute; - for (let i = 1; i < 48; i++) { + for (let i = 0; i <= 96; i++) { const time = dayjs().hour(hour).minute(minute).second(0); const formatted = time.format("h:mm A"); diff --git a/src/pages/product/components/Extra.tsx b/src/pages/product/components/Extra.tsx index 65bf371..6afcaf8 100644 --- a/src/pages/product/components/Extra.tsx +++ b/src/pages/product/components/Extra.tsx @@ -5,6 +5,7 @@ import { Dispatch, SetStateAction } from "react"; import { useTranslation } from "react-i18next"; import { Extra as ExtraType } from "utils/types/appTypes"; import styles from "../product.module.css"; +import { formatPriceUi } from "utils/helpers"; export default function Extra({ extrasList, @@ -49,7 +50,7 @@ export default function Extra({ return { value: value.id.toString(), label: value.name, - price: `+${value.price}`, + price: `+${formatPriceUi(value.price, 3)}`, }; })} value={selectedExtras.map((ex) => ex.id.toString())} diff --git a/src/pages/product/components/ProductFooter.tsx b/src/pages/product/components/ProductFooter.tsx index 681a2b9..769900b 100644 --- a/src/pages/product/components/ProductFooter.tsx +++ b/src/pages/product/components/ProductFooter.tsx @@ -94,7 +94,6 @@ export default function ProductFooter({ const extrasInfo = groupInfo?.extras.filter((e) => selectedGroupExtrasIds.includes(e.id.toString()), ); - console.log(extrasInfo); return { groupid: key, extrasid: selectedGroupExtrasIds,