diff --git a/apps/nowait-user/src/assets/icon/Add.svg b/apps/nowait-user/src/assets/icon/Add.svg new file mode 100644 index 00000000..652ef0d5 --- /dev/null +++ b/apps/nowait-user/src/assets/icon/Add.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/apps/nowait-user/src/components/common/QuantitySelector.tsx b/apps/nowait-user/src/components/common/QuantitySelector.tsx index b56e428e..ba504803 100644 --- a/apps/nowait-user/src/components/common/QuantitySelector.tsx +++ b/apps/nowait-user/src/components/common/QuantitySelector.tsx @@ -11,31 +11,34 @@ interface storeProps { mode: "store"; id: string; quantity: number; - increaseQuantity: (id: string) => void; - decreaseQuantity: (id: string) => void; + price: number; + increaseQuantity: (id: string, price: number) => void; + decreaseQuantity: (id: string, price: number) => void; } type PropsType = stateProps | storeProps; const QuantitySelector = (props: PropsType) => { const increaseQuantityButton = () => { if (props.mode === "store") { - props.increaseQuantity(props.id); + props.increaseQuantity(props.id, props.price); } else if (props.mode === "state") { - props.setQuantity((prev) => prev + 1); + props.setQuantity(props.quantity + 1); } }; const decreaseQuantityButton = () => { if (props.mode === "store") { - props.decreaseQuantity(props.id); + props.decreaseQuantity(props.id, props.price); } else if (props.mode === "state") { - props.setQuantity((prev) => prev - 1); + props.setQuantity(props.quantity - 1); } }; return (
+
+ ); +}; + +export default EmptyCart; diff --git a/apps/nowait-user/src/components/order/MenuItem.tsx b/apps/nowait-user/src/components/order/MenuItem.tsx index 7c16d39d..9eddd8db 100644 --- a/apps/nowait-user/src/components/order/MenuItem.tsx +++ b/apps/nowait-user/src/components/order/MenuItem.tsx @@ -1,4 +1,3 @@ -import React, { useState } from "react"; import QuantitySelector from "../common/QuantitySelector"; import close from "../../assets/icon/close.svg"; import { useCartStore } from "../../stores/cartStore"; @@ -30,6 +29,7 @@ const MenuItem = ({ id, name, price, quantity }: PropsType) => { mode="store" id={id} quantity={quantity} + price={price / quantity} increaseQuantity={increaseQuantity} decreaseQuantity={decreaseQuantity} /> diff --git a/apps/nowait-user/src/components/order/PageFooterButton.tsx b/apps/nowait-user/src/components/order/PageFooterButton.tsx index 635ed496..6e4e90a2 100644 --- a/apps/nowait-user/src/components/order/PageFooterButton.tsx +++ b/apps/nowait-user/src/components/order/PageFooterButton.tsx @@ -8,10 +8,8 @@ const PageFooterButton = ({ className?: string; }) => { return ( -