fix: final commit (#46)

Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #46

app/(main)/manager-signup/page.tsx

@@ -19,12 +19,14 @@ export default function ManagerSignupPage() {
     phone: "",
     password: "",
     eateryName: "",
+    bankAccount: "", // 1. Thêm bankAccount vào state
   });
   const [errors, setErrors] = useState({
     name: "",
     phone: "",
     password: "",
     eateryName: "",
+    bankAccount: "", // 2. Thêm bankAccount vào errors state
     submit: "",
   });
 
@@ -32,9 +34,6 @@ export default function ManagerSignupPage() {
     fetch("/api/manager/signup")
       .then((res) => {
         setPageState("available");
-        // if (res.ok) ;
-        // else if (res.status === 403) setPageState("closed");
-        // else setPageState("error");
       })
       .catch(() => setPageState("error"));
   }, []);
@@ -54,6 +53,7 @@ export default function ManagerSignupPage() {
       phone: "",
       password: "",
       eateryName: "",
+      bankAccount: "",
       submit: "",
     };
     if (!form.name.trim()) next.name = "Please enter your full name";
@@ -65,8 +65,18 @@ export default function ManagerSignupPage() {
       next.password = "Password must be at least 6 characters";
     if (!form.eateryName.trim())
       next.eateryName = "Please enter the restaurant name";
+
+    if (!form.bankAccount.trim())
+      next.bankAccount = "Please enter your bank account number";
+
     setErrors(next);
-    return !next.name && !next.phone && !next.password && !next.eateryName;
+    return (
+      !next.name &&
+      !next.phone &&
+      !next.password &&
+      !next.eateryName &&
+      !next.bankAccount
+    );
   };
 
   const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
@@ -232,6 +242,14 @@ export default function ManagerSignupPage() {
                 field: "eateryName" as const,
                 type: "text",
               },
+              {
+                id: "bankAccount",
+                label: "Bank account number (example: acb-44359797)",
+                icon: "fa-credit-card",
+                placeholder: "Enter account number (for QR payment)",
+                field: "bankAccount" as const,
+                type: "text",
+              },
             ].map(({ id, label, icon, placeholder, field, type }) => (
               <div key={id}>
                 <label

app/(main)/payment/page.tsx

@@ -2,7 +2,6 @@
 
 import Button from "@/components/atoms/buttons/Button";
 import PaymentSummaryCard from "@/components/molecules/cards/PaymentSummaryCard";
-import { useAuth } from "@/lib/auth-context";
 import { useCart } from "@/lib/cart-context";
 import { useManager } from "@/lib/manager-context";
 import { MenuItemEntity } from "@/lib/types";
@@ -20,7 +19,7 @@ export default function PaymentPage() {
     removeFromCart,
     setQuantity,
   } = useCart();
-  const { user } = useAuth();
+
   const { products } = useManager();
 
   const findProduct = (id: string): MenuItemEntity =>
@@ -31,8 +30,6 @@ export default function PaymentPage() {
       price: 0,
     } as MenuItemEntity);
 
-  const isCustomer = user?.role === "customer";
-
   return (
     <div>
       <div className="mx-auto w-full max-w-screen-2xl px-4 py-6 md:px-6 md:py-8 lg:px-8">
@@ -82,7 +79,6 @@ export default function PaymentPage() {
                           quantity,
                         }) => {
                           const { name, description } = findProduct(id);
-
                           return (
                             <tr
                               key={id}
@@ -102,24 +98,20 @@ export default function PaymentPage() {
                                   <button
                                     onClick={() => decreaseQty(id)}
                                     className="inline-flex h-8 w-8 items-center justify-center rounded-lg border border-(--color-border) hover:bg-(--color-border-light)"
-                                    aria-label={`Decrease quantity of ${name}`}
                                   >
                                     -
                                   </button>
                                   <input
                                     type="number"
-                                    min={1}
                                     value={quantity}
                                     onChange={(e) =>
                                       setQuantity(id, Number(e.target.value))
                                     }
                                     className="h-8 w-16 rounded-lg border border-(--color-border) bg-transparent text-center"
-                                    title="Enter quantity"
                                   />
                                   <button
                                     onClick={() => increaseQty(id)}
                                     className="inline-flex h-8 w-8 items-center justify-center rounded-lg border border-(--color-border) hover:bg-(--color-border-light)"
-                                    aria-label={`Increase quantity of ${name}`}
                                   >
                                     +
                                   </button>
@@ -131,7 +123,6 @@ export default function PaymentPage() {
                                   variant="danger"
                                   size="md"
                                   style="payment"
-                                  aria-label={`Remove ${name} from cart`}
                                 >
                                   Delete product
                                 </Button>
@@ -149,7 +140,7 @@ export default function PaymentPage() {
 
           <PaymentSummaryCard
             totalPrice={totalPrice}
-            isCustomer={isCustomer}
+            isCustomer={true}
             backHref="/"
             eateryId={eateryId}
           />

components/molecules/cards/PaymentSummaryCard.tsx

@@ -1,6 +1,10 @@
 import { formatPrice } from "@/app/(main)/payment/page";
 import Button from "@/components/atoms/buttons/Button";
 import { ReviewModal } from "@/components/organisms/modals";
+import { cartClient } from "@/lib/apollo-clients";
+import { useCart } from "@/lib/cart-context";
+import { gql } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
 import Link from "next/link";
 import { useState } from "react";
 
@@ -12,9 +16,10 @@ export default function PaymentSummaryCard({
   backHref,
   eateryId,
 }: PaymentSummaryCardProps) {
+  const { cart,removeCart } = useCart();
   const [isReviewOpen, setIsReviewOpen] = useState(false);
+  const [isQrModalOpen, setIsQrModalOpen] = useState(false);
   const handlePayment = () => {
-    // UI-only: open review modal after "payment"
     if (isCustomer) {
       setIsReviewOpen(true);
     }
@@ -44,7 +49,9 @@ export default function PaymentSummaryCard({
 
           <Button
             style="payment"
-            onClick={handlePayment}
+            onClick={() => {
+              setIsQrModalOpen(true);
+            }}
             icon="fa-solid fa-qrcode"
             size="md"
             variant="secondary"
@@ -52,22 +59,7 @@ export default function PaymentSummaryCard({
             QR Code
           </Button>
 
-          {isCustomer && (
+          <Link href={backHref || "/"} className={"col-span-2"}>
-            <Button
-              style="payment"
-              onClick={handlePayment}
-              icon="fa-solid fa-star"
-              size="md"
-              variant="primary"
-            >
-              Review
-            </Button>
-          )}
-
-          <Link
-            href={backHref || "/"}
-            className={isCustomer ? "" : "col-span-2"}
-          >
             <Button
               style="payment"
               onClick={() => setIsReviewOpen(false)}
@@ -84,9 +76,51 @@ export default function PaymentSummaryCard({
 
       <ReviewModal
         isOpen={isReviewOpen}
-        onClose={() => setIsReviewOpen(false)}
+        onClose={() => {
+          setIsReviewOpen(false);
+
+          removeCart();
+        }}
         eateryId={eateryId}
       />
+
+      {isQrModalOpen && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4 backdrop-blur-sm">
+          <div className="animate-in fade-in zoom-in w-full max-w-sm rounded-3xl bg-white p-6 text-center shadow-2xl duration-300">
+            <h2 className="mb-4 text-xl font-bold">Scan to Pay</h2>
+
+            {cart.paymentQrUrl ? (
+              <div className="mb-4 rounded-2xl bg-gray-100 p-4">
+                <img
+                  src={cart.paymentQrUrl}
+                  alt="Payment QR Code"
+                  className="mx-auto h-auto w-full"
+                />
+              </div>
+            ) : (
+              <div className="p-10 text-gray-400">QR Code not available</div>
+            )}
+
+            <p className="mb-6 text-sm text-gray-500">
+              Total:{" "}
+              <span className="font-bold text-black">
+                {formatPrice(totalPrice)}
+              </span>
+            </p>
+
+            <Button
+              onClick={() => {
+                setIsQrModalOpen(false);
+                setIsReviewOpen(true);
+              }}
+              variant="secondary"
+              className="w-full"
+            >
+              Close
+            </Button>
+          </div>
+        </div>
+      )}
     </aside>
   );
 }

components/organisms/modals/ReviewModal.tsx

@@ -29,10 +29,10 @@ export default function ReviewModal({
   if (!isOpen) return null;
 
   const handleSubmit = async () => {
-    if (!user?.id || !eateryId) return;
+    if (!eateryId) return;
 
     const input: CreateReviewInput = {
-      reviewerId: user.id,
+      reviewerId: user?.id || "",
       eateryId,
       rating,
       ...(review.trim() ? { comment: review.trim() } : {}),

lib/cart-context.tsx

@@ -18,12 +18,14 @@ interface CartContextValue {
   items: CartItemEntity[];
   totalItems: number;
   totalPrice: number;
+  cart: CartEntity;
   eateryId: string | undefined;
   addToCart: (product: CartItemEntity) => void;
   increaseQty: (id: string) => void;
   decreaseQty: (id: string) => void;
   removeFromCart: (id: string) => void;
   setQuantity: (id: string, quantity: number) => void;
+  removeCart: () => void;
 }
 
 const CART_ID = "cartId";
@@ -120,6 +122,7 @@ export function CartProvider({ children }: { children: React.ReactNode }) {
           }
         } catch (err) {
           console.error("Lỗi khi tạo giỏ hàng:", err);
+          localStorage.removeItem(CART_ID);
         }
       }
     };
@@ -151,6 +154,25 @@ export function CartProvider({ children }: { children: React.ReactNode }) {
     if (result) setCart(result.addItem);
   };
 
+  const DELETE_CART = gql`
+    mutation deleteCart($cartId: String!) {
+      deleteCart(cartId: $cartId)
+    }
+  `;
+
+  const [mutateDeleteCart] = useMutation(DELETE_CART, {
+    client: cartClient,
+  });
+
+  const removeCart = async () => {
+    localStorage.removeItem(CART_ID);
+
+    await mutateDeleteCart({ variables: { cartId } });
+
+    setCartId(null);
+    setCart(null!);
+  };
+
   const setQuantity = async (id: string, newQuantity: number) => {
     if (!cartId) return;
 
@@ -191,6 +213,8 @@ export function CartProvider({ children }: { children: React.ReactNode }) {
       decreaseQty,
       removeFromCart,
       setQuantity,
+      removeCart,
+      cart,
     }),
     [cart?.items, cart?.totalAmount, cart?.eateryId],
   );