diff --git a/src/pages/coupon/components/CouponUsageSettings.tsx b/src/pages/coupon/components/CouponUsageSettings.tsx
index 08cde35..a544d35 100644
--- a/src/pages/coupon/components/CouponUsageSettings.tsx
+++ b/src/pages/coupon/components/CouponUsageSettings.tsx
@@ -42,7 +42,7 @@ const CouponUsageSettings: FC = ({ formik }) => {
/>
+
= ({ formik }) => {
}}
/>
+
+
+ {
+ const value = e.target.value.trim()
+ formik.setFieldValue('userPhone', value || undefined)
+ }}
+ error_text={formik.touched.userPhone && formik.errors.userPhone ? formik.errors.userPhone : ''}
+ />
+
>
)
}
diff --git a/src/pages/coupon/components/FoodSelector.tsx b/src/pages/coupon/components/FoodSelector.tsx
index 2bd588e..747602f 100644
--- a/src/pages/coupon/components/FoodSelector.tsx
+++ b/src/pages/coupon/components/FoodSelector.tsx
@@ -25,26 +25,26 @@ const FoodSelector: FC
= ({ formik, foods }) => {
}, [foods, search])
const handleToggle = (foodId: string, checked: boolean) => {
- const currentIds = formik.values.foodIds || []
+ const currentIds = formik.values.foods || []
if (checked) {
- formik.setFieldValue('foodIds', [...currentIds, foodId])
+ formik.setFieldValue('foods', [...currentIds, foodId])
} else {
- formik.setFieldValue('foodIds', currentIds.filter((id) => id !== foodId))
+ formik.setFieldValue('foods', currentIds.filter((id) => id !== foodId))
}
}
const handleSelectAll = (checked: boolean) => {
if (checked) {
- formik.setFieldValue('foodIds', filteredFoods.map((food) => food.id))
+ formik.setFieldValue('foods', filteredFoods.map((food) => food.id))
} else {
- formik.setFieldValue('foodIds', [])
+ formik.setFieldValue('foods', [])
}
}
const isAllSelected = useMemo(() => {
return filteredFoods.length > 0 &&
- filteredFoods.every((food) => formik.values.foodIds?.includes(food.id))
- }, [filteredFoods, formik.values.foodIds])
+ filteredFoods.every((food) => formik.values.foods?.includes(food.id))
+ }, [filteredFoods, formik.values.foods])
return (
@@ -68,7 +68,7 @@ const FoodSelector: FC
= ({ formik, foods }) => {
{filteredFoods.map((food) => (
handleToggle(food.id, checked as boolean)
}
diff --git a/src/pages/coupon/types/Types.ts b/src/pages/coupon/types/Types.ts
index 1d78b11..7809596 100644
--- a/src/pages/coupon/types/Types.ts
+++ b/src/pages/coupon/types/Types.ts
@@ -30,7 +30,6 @@ export type CreateCouponType = {
code: string;
name: string;
description: string;
- type: CouponType;
value: number;
maxDiscount: number | null;
minOrderAmount: number;
@@ -39,6 +38,8 @@ export type CreateCouponType = {
startDate: string | null;
endDate: string | null;
isActive: boolean;
- categoryIds?: string[];
- foodIds?: string[];
+ foodCategories?: string[];
+ foods?: string[];
+ userPhone?: string;
+ type: CouponType;
};
diff --git a/src/shared/SideBar.tsx b/src/shared/SideBar.tsx
index d48d16d..faf8a1f 100644
--- a/src/shared/SideBar.tsx
+++ b/src/shared/SideBar.tsx
@@ -142,7 +142,7 @@ const SideBar: FC = () => {
icon={}
title={t('sidebar.discount')}
isActive={isActive('discounts')}
- link={Pages.discount.list}
+ link={Pages.coupons.list}
name='discounts'
activeName='discounts'
/>