cart & checkout: apply validation based on required inputs in each service & add phone input in checkout page

src/pages/cart/components/CartMobileTabletLayout.tsx

@@ -1,5 +1,5 @@
 import { PlusOutlined } from "@ant-design/icons";
-import { Card, Divider, Space } from "antd";
+import { Card, Divider, Form, Space } from "antd";
 import ArabicPrice from "components/ArabicPrice";
 import CartActionsButtons from "components/CartActionsButtons/CartActionsButtons.tsx";
 import ImageWithFallback from "components/ImageWithFallback";
@@ -35,7 +35,9 @@ interface CartMobileTabletLayoutProps {
   form: FormInstance;
 }
 
-export default function CartMobileTabletLayout({ form }: CartMobileTabletLayoutProps) {
+export default function CartMobileTabletLayout({
+  form,
+}: CartMobileTabletLayoutProps) {
   const { t } = useTranslation();
   const { items, collectionMethod } = useAppSelector(selectCart);
   const { id } = useParams();
@@ -235,24 +237,30 @@ export default function CartMobileTabletLayout({ form }: CartMobileTabletLayoutP
           {/* Collection Method */}
           {orderType === "pickup" && (
             <ProInputCard title={t("cart.collectionMethod")}>
-              <ProRatioGroups
-                options={[
-                  { label: t("cart.Cash"), value: "cod", price: "" },
-                  {
-                    label: t("cart.e-payment"),
-                    value: "paymentgateway",
-                    price: "",
-                  },
-                ]}
-                value={collectionMethod}
-                onRatioClick={(value) => {
-                  if (value === "cod") {
-                    updateCollectionMethod(value);
-                  } else {
-                    updateCollectionMethod(value);
-                  }
-                }}
-              />
+              <Form.Item
+                name="collectionMethod"
+                required
+                rules={[{ required: true }]}
+              >
+                <ProRatioGroups
+                  options={[
+                    { label: t("cart.Cash"), value: "cod", price: "" },
+                    {
+                      label: t("cart.e-payment"),
+                      value: "paymentgateway",
+                      price: "",
+                    },
+                  ]}
+                  value={collectionMethod}
+                  onRatioClick={(value) => {
+                    if (value === "cod") {
+                      updateCollectionMethod(value);
+                    } else {
+                      updateCollectionMethod(value);
+                    }
+                  }}
+                />
+              </Form.Item>
             </ProInputCard>
           )}
 

src/pages/cart/components/cartFooter/CartFooter.tsx

@@ -1,5 +1,5 @@
 import { colors } from "ThemeConstants.ts";
-import { Button, FormInstance } from "antd";
+import { Button, FormInstance, message } from "antd";
 import { selectCart } from "features/order/orderSlice.ts";
 import { useTranslation } from "react-i18next";
 import { Link, useNavigate, useParams } from "react-router-dom";
@@ -17,15 +17,15 @@ export default function CartFooter({ form }: CartFooterProps) {
   const orderType = localStorage.getItem("orderType");
   const navigate = useNavigate();
 
-  // Check if checkout should be disabled
-  const isCheckoutDisabled = items.length === 0;
-
   const handleCheckoutClick = async () => {
-    try {
-      await form.validateFields();
-      navigate(`/${id}/checkout`);
-    } catch (error) {
-      console.log("Form validation failed:", error);
+    if (items.length === 0) message.warning(t("cart.pleaseAddItemsToCart"));
+    else {
+      try {
+        await form.validateFields();
+        navigate(`/${id}/checkout`);
+      } catch (error) {
+        console.log("Form validation failed:", error);
+      }
     }
   };
 
@@ -60,7 +60,6 @@ export default function CartFooter({ form }: CartFooterProps) {
           color: "white",
           width: "100%",
         }}
-        disabled={isCheckoutDisabled}
         onClick={handleCheckoutClick}
       >
         {t("cart.checkout")}

src/pages/cart/components/timeEstimate/TimeEstimateCard.tsx

@@ -1,3 +1,4 @@
+import { Form } from "antd";
 import ProInputCard from "components/ProInputCard/ProInputCard.tsx";
 import ProRatioGroups from "components/ProRatioGroups/ProRatioGroups.tsx";
 import { selectCart, updateEstimateTime } from "features/order/orderSlice.ts";
@@ -27,22 +28,24 @@ export default function TimeEstimateCard() {
   return (
     <>
       <ProInputCard title={t("cart.estimateTime")}>
-        <ProRatioGroups
-          options={[
-            { label: t("cart.now"), value: "now", price: "" },
-            { label: t("cart.later"), value: "later", price: "" },
-          ]}
-          value={estimateWay}
-          onRatioClick={(value) => {
-            if (value === "now") {
-              setEstimateWay(value);
-              handleEstimateTimeSave(new Date(), "now");
-            } else {
-              setEstimateWay(value);
-              setIsEstimateTimeOpen(true);
-            }
-          }}
-        />
+        <Form.Item name="estimateWay" required rules={[{ required: true }]}>
+          <ProRatioGroups
+            options={[
+              { label: t("cart.now"), value: "now", price: "" },
+              { label: t("cart.later"), value: "later", price: "" },
+            ]}
+            value={estimateWay}
+            onRatioClick={(value) => {
+              if (value === "now") {
+                setEstimateWay(value);
+                handleEstimateTimeSave(new Date(), "now");
+              } else {
+                setEstimateWay(value);
+                setIsEstimateTimeOpen(true);
+              }
+            }}
+          />
+        </Form.Item>
       </ProInputCard>
       {isDesktop ? (
         <Dialog

src/pages/cart/components/youMayLike/YouMayAlsoLike.module.css

@@ -1,3 +1,7 @@
+.youMightAlsoLikeTitle {
+  margin: 0 16px 16px 16px;
+}
+
 .youMightAlsoLikeContainer {
   display: flex;
   flex-direction: row;
@@ -66,6 +70,9 @@
   .youMightAlsoLikeContainer {
     height: 200px !important;
   }
+  .youMightAlsoLikeTitle {
+    margin: 16px;
+  }
 }
 
 /* Hover effects for devices that support hover */

src/pages/cart/components/youMayLike/YouMightAlsoLike.tsx

@@ -117,7 +117,7 @@ export default function YouMightAlsoLike() {
 
   return (
     <>
-      <div style={{ margin: 16 }}>
+      <div className={styles.youMightAlsoLikeTitle} >
         <ProText
           strong
           style={{

src/pages/checkout/components/CheckoutButton.tsx

@@ -1,11 +1,11 @@
-import { Button } from "antd";
+import { Button, FormInstance } from "antd";
 import { useCallback, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { useNavigate, useParams } from "react-router-dom";
 import styles from "../../address/address.module.css";
 import useOrder from "../hooks/useOrder";
 
-export default function CheckoutButton() {
+export default function CheckoutButton({ form }: { form: FormInstance }) {
   const { t } = useTranslation();
   const orderType = useMemo(() => localStorage.getItem("orderType"), []);
   const navigate = useNavigate();
@@ -16,13 +16,18 @@ export default function CheckoutButton() {
     navigate(`/${id}/split-bill`);
   }, [navigate, id]);
 
-  const handlePlaceOrderClick = useCallback(() => {
-    handleCreateOrder();
-  }, [handleCreateOrder]);
+  const handlePlaceOrderClick = useCallback(async () => {
+    try {
+      await form.validateFields();
+      handleCreateOrder();
+    } catch (error) {
+      console.log(error);
+    }
+  }, [handleCreateOrder, form]);
 
   const shouldShowSplitBill = useMemo(
     () => orderType === "dine-in",
-    [orderType]
+    [orderType],
   );
 
   return (

src/pages/checkout/components/phoneCard.tsx

@@ -0,0 +1,27 @@
+import { Form, Input } from "antd";
+import ProInputCard from "components/ProInputCard/ProInputCard.tsx";
+import { selectCart, updatePhone } from "features/order/orderSlice";
+import { useTranslation } from "react-i18next";
+import { useAppDispatch, useAppSelector } from "redux/hooks";
+
+export default function PhoneCard() {
+  const { t } = useTranslation();
+  const dispatch = useAppDispatch();
+  const { phone } = useAppSelector(selectCart);
+  return (
+    <>
+      <ProInputCard title={t("checkout.phoneNumber")}>
+        <Form.Item name="phone" required rules={[{ required: true }]}>
+          <Input
+            placeholder={t("checkout.phoneNumber")}
+            size="large"
+            autoFocus={false}
+            style={{ padding: "7px 11px", height: 50, borderRadius: 888 }}
+            value={phone}
+            onChange={(e) => dispatch(updatePhone(e.target.value))}
+          />
+        </Form.Item>
+      </ProInputCard>
+    </>
+  );
+}

src/pages/checkout/hooks/useOrder.ts

@@ -13,14 +13,14 @@ export default function useOrder() {
   const { mobilenumber, user_uuid } = JSON.parse(
     localStorage.getItem("customer") || "{}"
   ) as Customer;
-  const { items, coupon, tip, tables, specialRequest } =
+  const { items, coupon, tip, tables, specialRequest, phone } =
     useAppSelector(selectCart);
 
   const [createOrder] = useCreateOrderMutation();
 
   const handleCreateOrder = useCallback(() => {
     createOrder({
-      phone: mobilenumber,
+      phone: mobilenumber || phone,
       couponID: coupon,
       discountAmount: 0,
       comment: specialRequest,

src/pages/checkout/page.tsx

@@ -1,3 +1,4 @@
+import { Form } from "antd";
 import OrderSummary from "components/OrderSummary/OrderSummary";
 import PaymentMethods from "components/PaymentMethods/PaymentMethods";
 import ProHeader from "components/ProHeader/ProHeader";
@@ -9,12 +10,15 @@ import CheckoutButton from "./components/CheckoutButton";
 import { GiftDetails } from "./components/GiftDetails";
 import { OfficeDetails } from "./components/OfficeDetails";
 import { RoomDetails } from "./components/RoomDetails";
+import PhoneCard from "./components/phoneCard";
 
 export default function CheckoutPage() {
   const { t } = useTranslation();
+  const [form] = Form.useForm();
 
   return (
     <>
+    <Form form={form}>
       <ProHeader>{t("checkout.title")}</ProHeader>
       <div className={styles.checkoutContainer}>
         <AddressSummary />
@@ -22,11 +26,13 @@ export default function CheckoutPage() {
         <OfficeDetails />
         <GiftDetails />
         <BriefMenu />
+        <PhoneCard />
         <PaymentMethods />
         <OrderSummary />
       </div>
 
-      <CheckoutButton />
+      <CheckoutButton form={form} />
+      </Form>
     </>
   );
 }