diff --git a/src/assets/locals/ar.json b/src/assets/locals/ar.json index 5c4832a..f487684 100644 --- a/src/assets/locals/ar.json +++ b/src/assets/locals/ar.json @@ -321,7 +321,8 @@ "today": "اليوم", "change": "تغيير", "pickup": "استلام", - "setPickupTime": "تحديد وقت الاستلام" + "setPickupTime": "تحديد وقت الاستلام", + "carPlateNumber": "رقم لوحة السيارة" }, "address": { "title": "العنوان", diff --git a/src/assets/locals/en.json b/src/assets/locals/en.json index a6b2f3e..ad75a41 100644 --- a/src/assets/locals/en.json +++ b/src/assets/locals/en.json @@ -341,7 +341,8 @@ "today": "Today", "change": "Change", "pickup": "Pickup", - "setPickupTime": "Set Pickup Time" + "setPickupTime": "Set Pickup Time", + "carPlateNumber": "Car Plate Number" }, "address": { "title": "Address", diff --git a/src/pages/cart/components/CartMobileTabletLayout.tsx b/src/pages/cart/components/CartMobileTabletLayout.tsx index 5f8c59e..0ff7597 100644 --- a/src/pages/cart/components/CartMobileTabletLayout.tsx +++ b/src/pages/cart/components/CartMobileTabletLayout.tsx @@ -148,8 +148,8 @@ export default function CartMobileTabletLayout({ {/* Car Plate*/} - {((orderType === OrderType.Pickup && pickup_type === "car") || - orderType === OrderType.ScheduledOrder) && } + {/* {((orderType === OrderType.Pickup && pickup_type === "car") || + orderType === OrderType.ScheduledOrder) && } */} {/* Estimate Time */} {/* {(orderType === OrderType.Pickup || diff --git a/src/pages/checkout/components/CarBottomSheet.tsx b/src/pages/checkout/components/CarBottomSheet.tsx index c7d6d80..822723d 100644 --- a/src/pages/checkout/components/CarBottomSheet.tsx +++ b/src/pages/checkout/components/CarBottomSheet.tsx @@ -7,6 +7,8 @@ import CarRatioGroups from "./CarRatioGroups/CarRatioGroups"; import PlusIcon from "components/Icons/PlusIcon"; import styles from "../checkout.module.css"; import { AddCarBottomSheet } from "components/CustomBottomSheet/AddCarBottomSheet"; +import { updatePlateCar } from "features/order/orderSlice"; +import { useAppDispatch } from "redux/hooks"; interface CarBottomSheetProps { isOpen: boolean; @@ -17,6 +19,7 @@ export function CarBottomSheet({ isOpen, onClose }: CarBottomSheetProps) { const { t } = useTranslation(); const [value, setValue] = useState(null); const [isAddCarOpen, setIsAddCarOpen] = useState(false); + const dispatch = useAppDispatch(); const handleCancel = () => { setValue(null); @@ -24,8 +27,8 @@ export function CarBottomSheet({ isOpen, onClose }: CarBottomSheetProps) { }; const handleSave = () => { + dispatch(updatePlateCar(value || "")); onClose(); - setValue(value); }; const handleAddCarClick = () => { @@ -38,9 +41,8 @@ export function CarBottomSheet({ isOpen, onClose }: CarBottomSheetProps) { // The parent component should handle reopening, but we'll ensure state is correct }; - const handleAddCarSave = (carDetails: any) => { - // Handle saving the new car details - console.log("Car details saved:", carDetails); + const handleAddCarSave = () => { + dispatch(updatePlateCar(value || "")); // After saving, close AddCarBottomSheet which will trigger reopening CarBottomSheet setIsAddCarOpen(false); }; diff --git a/src/pages/checkout/components/CarCard.tsx b/src/pages/checkout/components/CarCard.tsx index f069767..e65abf4 100644 --- a/src/pages/checkout/components/CarCard.tsx +++ b/src/pages/checkout/components/CarCard.tsx @@ -13,11 +13,15 @@ export function CarCard() { const { t } = useTranslation(); const { isRTL } = useAppSelector((state) => state.locale); const [isCarBottomSheetOpen, setIsCarBottomSheetOpen] = useState(false); + const { plateCar } = useAppSelector((state) => state.order); + return ( <> - { - setIsCarBottomSheetOpen(true); - }}> + { + setIsCarBottomSheetOpen(true); + }} + >
{isRTL ? : } diff --git a/src/pages/checkout/components/CarRatioGroups/CarRatioGroups.tsx b/src/pages/checkout/components/CarRatioGroups/CarRatioGroups.tsx index 7595b14..6e33a03 100644 --- a/src/pages/checkout/components/CarRatioGroups/CarRatioGroups.tsx +++ b/src/pages/checkout/components/CarRatioGroups/CarRatioGroups.tsx @@ -24,9 +24,7 @@ const CarRatioGroups = ({ showDivider = false, ...props }: CarRatioGroupsProps) => { - const { t } = useTranslation(); const handleChange = (e: RadioChangeEvent) => { - console.log(e.target.value); // If onChange is provided (from Form.Item), use it if (onChange) { onChange(e); diff --git a/src/pages/checkout/page.tsx b/src/pages/checkout/page.tsx index 8ce50b4..ba144c7 100644 --- a/src/pages/checkout/page.tsx +++ b/src/pages/checkout/page.tsx @@ -1,29 +1,25 @@ -import { Flex, Form, Layout } from "antd"; import InputCard from "components/InputCard"; import OrderSummary from "components/OrderSummary/OrderSummary"; import PaymentMethods from "components/PaymentMethods/PaymentMethods"; import ProHeader from "components/ProHeader/ProHeader"; -import { selectCart, updateCollectionMethod } from "features/order/orderSlice"; +import { selectCart } from "features/order/orderSlice"; import { useTranslation } from "react-i18next"; -import { useAppDispatch, useAppSelector } from "redux/hooks"; +import { useAppSelector } from "redux/hooks"; import styles from "../address/address.module.css"; import { AddressSummary } from "./components/AddressSummary"; import CheckoutButton from "./components/CheckoutButton"; import { GiftCard } from "./components/GiftCard"; import { OrderType } from "./hooks/types"; -import RewardWaiterCard from "pages/cart/components/RewardWaiterCard"; -import ProInputCard from "components/ProInputCard/ProInputCard"; -import ProRatioGroups from "components/ProRatioGroups/ProRatioGroups"; import CouponCard from "pages/cart/components/CouponCard"; import BriefMenuCard from "./components/BriefMenuCard"; import CustomerInformationCard from "./components/CustomerInformationCard"; -import Ads1 from "components/Ads/Ads1"; import { useEffect } from "react"; import { CarCard } from "./components/CarCard"; import { CollectWay } from "./components/CollectWay/CollectWay"; import PickupTimeCard from "./components/pickupEstimate/TimeEstimateCard"; import VoucherSummary from "pages/redeem/components/VoucherSummary/VoucherSummary"; import EarnLoyaltyPointsCard from "pages/cart/components/earnLoyaltyPointsCard/EarnLoyaltyPointsCard"; +import { Form, Layout } from "antd"; export default function CheckoutPage() { const { t } = useTranslation(); @@ -38,7 +34,6 @@ export default function CheckoutPage() { tip, } = useAppSelector(selectCart); const { token } = useAppSelector((state) => state.auth); - const dispatch = useAppDispatch(); useEffect(() => { form.setFieldsValue({ coupon, collectionMethod, phone, customerName, tip }); }, [form, phone, coupon, collectionMethod, customerName, tip]);