diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 4f27b3d..b8c753e 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -178,7 +178,6 @@ "context": "آیا از تایید این آیتم اطمینان دارید؟", "button-cancel": "بستن", "button-confirm": "تایید", - "amount_error": "وارد کردن مقدار پیشنهادی الزامیست", "description_error": "وارد کردن توضیحات الزامی است!", "optional": " (اختیاری)", "unit": " (ریال)", @@ -186,7 +185,10 @@ "choose_file": "انتخاب فایل", "approved_amount": "مبلغ تصویب شده", "approved_amount_error": "وارد کردن مبلغ تصویب شده الزامیست", - "proposed_amount": "مقدار پیشنهادی" + "approved_amount_positive": "مبلغ تصویب شده باید مثبت باشد", + "proposed_amount_error": "وارد کردن مقدار پیشنهادی الزامیست", + "proposed_amount": "مقدار پیشنهادی", + "proposed_amount_positive": "مقدار پیشنهادی باید مثبت باشد" }, "RejectDialog": { "reject": "عدم تایید", diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx index 4ba49e2..2e457b1 100644 --- a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx +++ b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx @@ -34,7 +34,7 @@ const Confirm = ({rowId, fetchUrl, mutate}) => { const [openConfirmDialog, setOpenConfirmDialog] = useState(false); const validationSchema = Yup.object().shape({ - proposed_amount: Yup.string().required(t("ConfirmDialog.amount_error")), + proposed_amount: Yup.number().positive(t("ConfirmDialog.proposed_amount_positive")).required(t("ConfirmDialog.proposed_amount_error")), }) const formik = useFormik({ initialValues: { @@ -68,9 +68,7 @@ const Confirm = ({rowId, fetchUrl, mutate}) => { formik.setFieldValue("description", event.target.value) }; const handleAmountChange = (event) => { - if (/^\d*$/.test(event.target.value)) { - formik.setFieldValue("proposed_amount", event.target.value); - } + formik.setFieldValue("proposed_amount", event.target.value); }; const handleUploadChange = (event) => { const uploadedFile = event.target?.files?.[0]; @@ -130,7 +128,6 @@ const Confirm = ({rowId, fetchUrl, mutate}) => { type="number" inputProps={{ min: 0, - inputMode: "numeric", pattern: "[0-9]*", }} variant="outlined" diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm.jsx index 8ca872d..ccbe43c 100644 --- a/src/components/dashboard/passenger-boss/Form/ConfirmForm.jsx +++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm.jsx @@ -34,9 +34,7 @@ const Confirm = ({rowId, fetchUrl, mutate}) => { const [openConfirmDialog, setOpenConfirmDialog] = useState(false); const validationSchema = Yup.object().shape({ - approved_amount: Yup.string().required( - t("ConfirmDialog.approved_amount_error") - ), + approved_amount: Yup.number().positive(t("ConfirmDialog.approved_amount_positive")).required(t("ConfirmDialog.approved_amount_error")) }); const formik = useFormik({ initialValues: { @@ -70,9 +68,7 @@ const Confirm = ({rowId, fetchUrl, mutate}) => { formik.setFieldValue("description", event.target.value) }; const handleAmountChange = (event) => { - if (/^\d*$/.test(event.target.value)) { - formik.setFieldValue("approved_amount", event.target.value); - } + formik.setFieldValue("approved_amount", event.target.value); }; const handleUploadChange = (event) => { const uploadedFile = event.target?.files?.[0]; @@ -132,7 +128,6 @@ const Confirm = ({rowId, fetchUrl, mutate}) => { type="number" inputProps={{ min: 0, - inputMode: "numeric", pattern: "[0-9]*", }} variant="outlined"