diff --git a/src/Components/ValidationField/utils/translatedOptions.ts b/src/Components/ValidationField/utils/translatedOptions.ts index 44b9b02..416a7ea 100644 --- a/src/Components/ValidationField/utils/translatedOptions.ts +++ b/src/Components/ValidationField/utils/translatedOptions.ts @@ -1,4 +1,6 @@ +import React from 'react' export const translateOptions = (options: any, t: any) => { + if(React.isValidElement(options?.[0].name))return options; return options?.map((opt: any) => ({ ...opt, label: t(`${opt?.label}`), diff --git a/src/Pages/ReSeller/Sales/Model/AddModel.tsx b/src/Pages/ReSeller/Sales/Model/AddModel.tsx index 864ef84..bfd5723 100644 --- a/src/Pages/ReSeller/Sales/Model/AddModel.tsx +++ b/src/Pages/ReSeller/Sales/Model/AddModel.tsx @@ -18,6 +18,7 @@ const AddModel: React.FC = () => { handleSubmit={handleSubmit} getInitialValues={getInitialValues(objectToEdit)} getValidationSchema={getValidationSchema} + canClearObjectToEdit = {false} > diff --git a/src/Pages/ReSeller/Sales/Model/LayoutModel.tsx b/src/Pages/ReSeller/Sales/Model/LayoutModel.tsx index 0da9fd6..bddf5c7 100644 --- a/src/Pages/ReSeller/Sales/Model/LayoutModel.tsx +++ b/src/Pages/ReSeller/Sales/Model/LayoutModel.tsx @@ -20,6 +20,7 @@ interface LayoutModalProps { ModelClassName?: string; width?: string; isLoading?: boolean; + canClearObjectToEdit?:boolean } const LayoutModel = ({ @@ -34,10 +35,11 @@ const LayoutModel = ({ ModelClassName, width = "800px", isLoading = false, + canClearObjectToEdit =true }: LayoutModalProps) => { const { isOpen, setIsOpen } = useModalState((state) => state); const { setObjectToEdit } = useObjectToEdit(); - const formik = useFormikContext(); + const formik = useFormikContext(); useEffect(() => { if (isAddModal && status === QueryStatusEnum.SUCCESS) { setIsOpen("isSuccess"); @@ -51,8 +53,9 @@ const LayoutModel = ({ }, [setIsOpen, status]); const handleCancel = () => { + console.log(true) setIsOpen(""); - setObjectToEdit({}); + canClearObjectToEdit && setObjectToEdit({}); formik.resetForm(); }; diff --git a/src/Pages/ReSeller/Sales/Model/SalesModelForm.tsx b/src/Pages/ReSeller/Sales/Model/SalesModelForm.tsx index 067ab6e..03a50fc 100644 --- a/src/Pages/ReSeller/Sales/Model/SalesModelForm.tsx +++ b/src/Pages/ReSeller/Sales/Model/SalesModelForm.tsx @@ -20,9 +20,14 @@ const Form = ({ handleCloseModel = () => {} }: ModalBodyProps) => { const student_info = objectToEdit?.data?.data; const status = objectToEdit?.data?.status; - const PackagesInfo = student_info?.packages.map((info: any) => ({ + const PackagesInfo = student_info?.packages?.map((info: any) => ({ id: info?.id, - name: info.name + " " + `( ${info?.original_price} )`, + name:( +
+ {info.name } ( {info?.original_price.toLocaleString("en-US")} ) + {info?.coupon_id !== null && {info?.final_price.toLocaleString("en-US")}} +
+ ) })); return ( diff --git a/src/Pages/ReSeller/Sales/Model/SubmitModelForm.tsx b/src/Pages/ReSeller/Sales/Model/SubmitModelForm.tsx index 43bf3be..e85ef5a 100644 --- a/src/Pages/ReSeller/Sales/Model/SubmitModelForm.tsx +++ b/src/Pages/ReSeller/Sales/Model/SubmitModelForm.tsx @@ -20,6 +20,7 @@ const Form = ({ handleCloseModel = () => {} }: ModalBodyProps) => { const queryClient = useQueryClient(); const { t } = useTranslation(); + const { mutate, status, error, reset }: any = useAddSales(); const coupon_id_object = objectToEdit?.data?.data?.packages.find( (e: any) => e.id === values?.package_id, @@ -27,7 +28,12 @@ const Form = ({ handleCloseModel = () => {} }: ModalBodyProps) => { const student_info = objectToEdit?.data?.data; const PackagesInfo = student_info?.packages.map((info: any) => ({ id: info?.id, - name: info.name + " " + `( ${info?.original_price} )`, + name:( +
+ {info.name } ( {info?.original_price.toLocaleString("en-US")} ) + {info?.coupon_id !== null && {info?.final_price.toLocaleString("en-US")}} +
+ ), })); const handleNext = () => { diff --git a/src/Pages/ReSeller/Sales/Model/ValidationModelForm.tsx b/src/Pages/ReSeller/Sales/Model/ValidationModelForm.tsx index 8e2ebed..7234250 100644 --- a/src/Pages/ReSeller/Sales/Model/ValidationModelForm.tsx +++ b/src/Pages/ReSeller/Sales/Model/ValidationModelForm.tsx @@ -19,7 +19,7 @@ const Form = ({ handleCloseModel = () => {} }: ModalBodyProps) => { const { values, setFieldValue } = useFormikContext(); const phoneNumber: number = values?.phone_number; - const { data, status, isSuccess } = useGetStudentByPhone( + const { data, status, isSuccess,isError } = useGetStudentByPhone( { phone_number: phoneNumber, }, @@ -36,12 +36,13 @@ const Form = ({ handleCloseModel = () => {} }: ModalBodyProps) => { }; useEffect(() => { - if (isSuccess) { + if (isSuccess && data?.data) { setTriggerApi(false); setObjectToEdit({ data }); + console.log(isSuccess) setFieldValue("currentModalIndex", values?.currentModalIndex + 1); } - }, [isSuccess]); + }, [isSuccess,isError,status]); return ( values?.currentModalIndex == 0 && ( diff --git a/src/Styles/App/classNames.scss b/src/Styles/App/classNames.scss index a7de627..8a994d2 100644 --- a/src/Styles/App/classNames.scss +++ b/src/Styles/App/classNames.scss @@ -318,3 +318,17 @@ button:disabled { height: 40px; } } + +.removed_sales{ + color: #dc2626; + text-decoration: line-through; + &.disapled{ + color: #dc26268b; + } +} +.new_sales{ + color:green; + &.disapled{ + color:rgba(0, 128, 0, 0.499); + } +} \ No newline at end of file