@@ -48,8 +49,10 @@ const Date = ({
size="large"
onChange={onChange || onCalendarChange}
disabled={isDisabled}
- format={Formatter}
+ format={props?.Format ?? Formatter}
id={name}
+ needConfirm={false}
+ {...props}
/>
{/*
*/}
diff --git a/src/Components/ValidationField/utils/types.ts b/src/Components/ValidationField/utils/types.ts
index 04b09a9..4174e1c 100644
--- a/src/Components/ValidationField/utils/types.ts
+++ b/src/Components/ValidationField/utils/types.ts
@@ -40,8 +40,9 @@ export type SearchFieldProps = BaseFieldProps &
type DateFieldProps = BaseFieldProps & {
type: "DataRange" | "Date" | "Time";
- Format?: "YYYY/MM/DD" | "MM/DD" | "YYYY/MM" | "YYYY-MM-DD HH:mm:ss.SSS";
+ Format?: "YYYY/MM/DD" | "MM/DD" | "YYYY/MM" | "YYYY-MM-DD HH:mm:ss.SSS" | "YYYY-MM-DD HH:mm:ss";
picker?: "data" | "week" | "month" | "quarter" | "year";
+ showTime?:boolean
};
type FileFieldProps = BaseFieldProps & {
diff --git a/src/Pages/Admin/City/Page.tsx b/src/Pages/Admin/City/Page.tsx
index 2046780..2972d70 100644
--- a/src/Pages/Admin/City/Page.tsx
+++ b/src/Pages/Admin/City/Page.tsx
@@ -33,7 +33,7 @@ const TableHeader = () => {
ModelAbility={ModalEnum?.CITY_ADD}
canAdd={canAddCity}
/>
-
} filterTitle="table.City" />
+
} haveFilter={false} filterTitle="table.City" />
diff --git a/src/Pages/Admin/Coupon/Model/AddModel.tsx b/src/Pages/Admin/Coupon/Model/AddModel.tsx
new file mode 100644
index 0000000..755c221
--- /dev/null
+++ b/src/Pages/Admin/Coupon/Model/AddModel.tsx
@@ -0,0 +1,38 @@
+import React from "react";
+import { getInitialValues, getValidationSchema } from "./formUtil";
+import { ModalEnum } from "../../../../enums/Model";
+import LayoutModel from "../../../../Layout/Dashboard/LayoutModel";
+import { QueryStatusEnum } from "../../../../enums/QueryStatus";
+import ModelForm from "./ModelForm";
+import { useAddCoupon } from "../../../../api/Coupon";
+import dayjs from "dayjs";
+
+const AddModel: React.FC = () => {
+ const { mutate, status } = useAddCoupon();
+
+ const handleSubmit = (values: any) => {
+ console.log(values?.due_to,"values?.due_to");
+ const due_to = values?.due_to.format("YYYY-MM-DD HH:mm:ss")
+ console.log(due_to);
+ mutate({
+ ...values,
+ due_to
+ });
+ };
+ return (
+ <>
+
+
+
+
+ );
+};
+
+export default AddModel;
diff --git a/src/Pages/Admin/Coupon/Model/EditModel.tsx b/src/Pages/Admin/Coupon/Model/EditModel.tsx
new file mode 100644
index 0000000..547f1c6
--- /dev/null
+++ b/src/Pages/Admin/Coupon/Model/EditModel.tsx
@@ -0,0 +1,38 @@
+import React from "react";
+import { getInitialValues, getValidationSchema } from "./formUtil";
+import { ModalEnum } from "../../../../enums/Model";
+import LayoutModel from "../../../../Layout/Dashboard/LayoutModel";
+import ModelForm from "./ModelForm";
+import { QueryStatusEnum } from "../../../../enums/QueryStatus";
+import { useObjectToEdit } from "../../../../zustand/ObjectToEditState";
+import { useUpdateCoupon } from "../../../../api/Coupon";
+import { handelImageState } from "../../../../utils/DataToSendImageState";
+
+const EditModel: React.FC = () => {
+ const { mutate, status } = useUpdateCoupon();
+ const { objectToEdit } = useObjectToEdit((state) => state);
+
+ const handleSubmit = (values: any) => {
+ const due_to = typeof values?.due_to === "string" ? values?.due_to : values?.due_to.format("YYYY-MM-DD HH:mm:ss")
+ const Data_to_send = { ...values , due_to };
+ mutate(Data_to_send);
+ };
+
+ return (
+ <>
+
+
+
+
+ );
+};
+
+export default EditModel;
diff --git a/src/Pages/Admin/Coupon/Model/FilterForm.tsx b/src/Pages/Admin/Coupon/Model/FilterForm.tsx
new file mode 100644
index 0000000..c870850
--- /dev/null
+++ b/src/Pages/Admin/Coupon/Model/FilterForm.tsx
@@ -0,0 +1,20 @@
+import React from "react";
+import ValidationField from "../../../../Components/ValidationField/ValidationField";
+import { Col, Row } from "reactstrap";
+import { useFormikContext } from "formik";
+
+const FilterForm = () => {
+ const formik = useFormikContext();
+
+ return (
+
+
+
+
+
+
+
+ );
+};
+
+export default FilterForm;
diff --git a/src/Pages/Admin/Coupon/Model/ModelForm.tsx b/src/Pages/Admin/Coupon/Model/ModelForm.tsx
new file mode 100644
index 0000000..ad316f7
--- /dev/null
+++ b/src/Pages/Admin/Coupon/Model/ModelForm.tsx
@@ -0,0 +1,62 @@
+import { Col, Row } from "reactstrap";
+import ValidationField from "../../../../Components/ValidationField/ValidationField";
+import { useValidationValidationParamState } from "../../../../Components/ValidationField/state/ValidationValidationParamState";
+import { useGetAllGrade } from "../../../../api/grade";
+
+const Form = ({Hide = false}:{Hide?:boolean }) => {
+ const { ValidationParamState } = useValidationValidationParamState();
+
+ const {
+ GradeName, GradeCurrentPage,
+ } = ValidationParamState;
+
+
+
+ const { data: Grade, isLoading: isLoadingGrade } = useGetAllGrade({
+ name: GradeName,
+ page: GradeCurrentPage
+ });
+ const GradeOption = Grade?.data ?? []
+ const canChangeGradePage = !!Grade?.links?.next;
+ const GradePage = Grade?.meta?.currentPage;
+ return (
+
+
+
+
+
+
+
+
+
+ {/*
+ grade_id
+ */}
+ {!Hide &&
+
+
+ }
+
+
+ );
+};
+
+export default Form;
diff --git a/src/Pages/Admin/Coupon/Model/formUtil.ts b/src/Pages/Admin/Coupon/Model/formUtil.ts
new file mode 100644
index 0000000..232a828
--- /dev/null
+++ b/src/Pages/Admin/Coupon/Model/formUtil.ts
@@ -0,0 +1,27 @@
+import * as Yup from "yup";
+import { Coupon, CouponInitialValues } from "../../../../types/Coupon";
+import dayjs from "dayjs";
+
+export const getInitialValues = (
+ objectToEdit: Partial
,
+): CouponInitialValues => {
+ return {
+ id: objectToEdit?.id,
+ name: objectToEdit?.name ?? "",
+ amount: objectToEdit?.amount ?? "",
+ code: objectToEdit?.code ?? "",
+ due_to: objectToEdit?.due_to ? dayjs(objectToEdit?.due_to,"YYYY-MM-DD HH:mm:ss") : "",
+ grade_id: objectToEdit?.grade_id ?? "",
+ };
+};
+
+export const getValidationSchema = () => {
+ // validate input
+ return Yup.object().shape({
+ name: Yup.string().required("validation.required"),
+ due_to: Yup.string().required("validation.required"),
+ code: Yup.string().required("validation.required").min(6,"validation.must_be_at_least_6_characters_long").max(6,"validation.must_be_at_least_6_characters_long"),
+ amount: Yup.number().required("validation.required").typeError("validation.Must_be_a_number"),
+
+ });
+};
diff --git a/src/Pages/Admin/Coupon/Page.tsx b/src/Pages/Admin/Coupon/Page.tsx
new file mode 100644
index 0000000..f41bc54
--- /dev/null
+++ b/src/Pages/Admin/Coupon/Page.tsx
@@ -0,0 +1,49 @@
+import { useTranslation } from "react-i18next";
+import { lazy, Suspense } from "react";
+import { Spin } from "antd";
+import useSetPageTitle from "../../../Hooks/useSetPageTitle";
+import { ModalEnum } from "../../../enums/Model";
+import { useDeleteCoupon } from "../../../api/Coupon";
+import PageHeader from "../../../Layout/Dashboard/PageHeader";
+import FilterLayout from "../../../Layout/Dashboard/FilterLayout";
+import FilterForm from "./Model/FilterForm";
+import { canAddCoupon } from "../../../utils/hasAbilityFn";
+
+const Table = lazy(() => import("./Table"));
+const AddModalForm = lazy(() => import("./Model/AddModel"));
+const EditModalForm = lazy(() => import("./Model/EditModel"));
+const DeleteModalForm = lazy(
+ () => import("../../../Layout/Dashboard/DeleteModels"),
+);
+
+const TableHeader = () => {
+ const [t] = useTranslation();
+ const deleteMutation = useDeleteCoupon();
+
+ useSetPageTitle([
+ {name:`${t(`page_header.home`)}`, path:"/"},
+ {name:`${t(`page_header.Coupon`)}`, path:"Coupon"}
+ ]);
+
+ return (
+
+
}>
+
+
} haveFilter={false} filterTitle="table.Coupon" />
+
+
+
+
+
+