From b47626f95047aa0e07535d29a86ec5134435faa5 Mon Sep 17 00:00:00 2001 From: Moaz Dawalibi Date: Wed, 25 Sep 2024 00:04:57 +0300 Subject: [PATCH] sale api --- src/Pages/ReSeller/Sales/Model/AddModel.tsx | 9 +++- .../ReSeller/Sales/Model/LayoutModel.tsx | 11 ++--- .../ReSeller/Sales/Model/SalesModelForm.tsx | 34 +++++++++++--- .../ReSeller/Sales/Model/SubmitModelForm.tsx | 29 +++++++++--- .../Sales/Model/ValidationModelForm.tsx | 44 +++++++++++++++---- src/Pages/ReSeller/Sales/Model/formUtil.ts | 11 ++++- src/Styles/Pages/sales.scss | 24 ++++++++++ src/api/sales.ts | 7 +-- src/translate/ar.json | 6 ++- 9 files changed, 140 insertions(+), 35 deletions(-) diff --git a/src/Pages/ReSeller/Sales/Model/AddModel.tsx b/src/Pages/ReSeller/Sales/Model/AddModel.tsx index e210318..10eeea0 100644 --- a/src/Pages/ReSeller/Sales/Model/AddModel.tsx +++ b/src/Pages/ReSeller/Sales/Model/AddModel.tsx @@ -8,6 +8,7 @@ import SubmitModelForm from "./SubmitModelForm"; import { useAddSales } from "../../../../api/sales"; import LayoutModel from "./LayoutModel"; +import { useObjectToEdit } from "../../../../zustand/ObjectToEditState"; const AddModel: React.FC = () => { const { mutate, status } = useAddSales(); @@ -29,7 +30,9 @@ const AddModel: React.FC = () => { [modal.Sure]: } // const modelTitle = Forms.[modal.Number] ? "sale" : Forms.Package ? "adcs" : "Ascas"; - + const { objectToEdit,setObjectToEdit } = useObjectToEdit(); +console.log(objectToEdit); + return ( <> @@ -45,7 +48,9 @@ const AddModel: React.FC = () => { > {/* {Forms["Number"]} */} <> - + + + diff --git a/src/Pages/ReSeller/Sales/Model/LayoutModel.tsx b/src/Pages/ReSeller/Sales/Model/LayoutModel.tsx index 1e05b87..cf8f36e 100644 --- a/src/Pages/ReSeller/Sales/Model/LayoutModel.tsx +++ b/src/Pages/ReSeller/Sales/Model/LayoutModel.tsx @@ -86,16 +86,13 @@ const LayoutModel = ({ }, [isOpen]); return
- -
{isLoading ? : children}
- - ; - }} - - + + }} + + ); }; diff --git a/src/Pages/ReSeller/Sales/Model/SalesModelForm.tsx b/src/Pages/ReSeller/Sales/Model/SalesModelForm.tsx index 90b826d..828c055 100644 --- a/src/Pages/ReSeller/Sales/Model/SalesModelForm.tsx +++ b/src/Pages/ReSeller/Sales/Model/SalesModelForm.tsx @@ -14,7 +14,7 @@ const Form = ({status}:{status?:any}) => { const {values,setFieldValue} = useFormikContext() console.log(values?.currentModalIndex); const { isOpen, setIsOpen } = useModalState((state) => state); - const { setObjectToEdit } = useObjectToEdit(); + const { objectToEdit,setObjectToEdit } = useObjectToEdit(); const {t} = useTranslation(); const formik = useFormikContext(); const handleNext = ()=>{ @@ -25,8 +25,17 @@ const Form = ({status}:{status?:any}) => { setObjectToEdit({}); }; +console.log(objectToEdit); + const student_info = objectToEdit?.data?.data + const PackagesInfo = student_info?.packages.map((info:any) => ({ + id: info?.id, + name: info.name + " " + `( ${info?.original_price} )` + })); + +console.log(PackagesInfo); + return ( - values?.currentModalIndex == 0 && + values?.currentModalIndex == 1 &&
@@ -36,8 +45,23 @@ const Form = ({status}:{status?:any}) => {
-sac - {values?.currentModalIndex} +
+
+ + +
{student_info?.first_name +" " + student_info?.last_name}
+
الصف:

{student_info?.grade_name}

+
+
+ +
+ {/* {values?.currentModalIndex} */}
{t("practical.cancel")} @@ -47,7 +71,7 @@ sac disabled={status === QueryStatusEnum.LOADING || !formik.dirty} onClick={handleNext} > - {t(`practical.search`)} + {t(`practical.sale`)} {status === QueryStatusEnum.LOADING && ( diff --git a/src/Pages/ReSeller/Sales/Model/SubmitModelForm.tsx b/src/Pages/ReSeller/Sales/Model/SubmitModelForm.tsx index e037a5c..69b78e6 100644 --- a/src/Pages/ReSeller/Sales/Model/SubmitModelForm.tsx +++ b/src/Pages/ReSeller/Sales/Model/SubmitModelForm.tsx @@ -18,7 +18,9 @@ const Form = ({status}:{status?:any}) => { const {t} = useTranslation(); const formik = useFormikContext(); const handleNext = ()=>{ - setFieldValue( "currentModalIndex" , values?.currentModalIndex + 1 ) + setFieldValue( "currentModalIndex" , values?.currentModalIndex - 2 ) + setIsOpen(""); + } const handleCancel = () => { setIsOpen(""); @@ -26,7 +28,7 @@ const Form = ({status}:{status?:any}) => { }; return ( - values?.currentModalIndex == 1 && + values?.currentModalIndex == 2 &&
@@ -36,18 +38,33 @@ const Form = ({status}:{status?:any}) => {
- - {values?.currentModalIndex} +
+
+ + +
أنس محمد ياسر القلعجي
+
الصف:

بكالوريا / علمي

+
+
+ +
+ {/* {values?.currentModalIndex} */}
{t("practical.cancel")}