From fcfee918916b6dcedc0763dc7ba85149682f41d8 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Tue, 14 Nov 2023 11:29:59 +0330 Subject: [PATCH] LFFE-19 maximum Rials --- public/locales/fa/app.json | 4 ++-- .../Form/ConfirmForm/ConfirmContent.jsx | 16 ++++++---------- .../Form/ConfirmForm/ConfirmContent.jsx | 16 ++++++---------- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 0481f1a..c905835 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -206,7 +206,7 @@ "upload_file_required": "وارد کردن صورت جلسه کارگروه استانی الزامیست", "upload_file_unit": "فایل بارگذاری شده باید حداکثر 2Mb باشد", "upload_file_format": "فرمت قابل قبول : png,jpg,pdf", - "max_amount": "حداکثر مبلغ تصویب شده {value} میلیون تومان می باشد" + "max_amount": "حداکثر مبلغ تصویب شده {value} میلیون ریال می باشد" }, "RefahiProvinceManager": { "name": "نام", @@ -305,7 +305,7 @@ "upload_file_required": "وارد کردن گزارش کارشناسی الزامیست", "upload_file_unit": "فایل بارگذاری شده باید حداکثر 2Mb باشد", "upload_file_format": "فرمت قابل قبول : png,jpg,pdf", - "max_amount": "حداکثر مبلغ پیشنهادی {value} میلیون تومان می باشد" + "max_amount": "حداکثر مبلغ پیشنهادی {value} میلیون ریال می باشد" }, "UserManagement": { "name": "نام", diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx index 93ee5a2..16b7ca3 100644 --- a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx @@ -9,6 +9,10 @@ import {useState} from "react"; import PriceField from "@/core/components/PriceField"; import * as Yup from "yup"; +const vehicle_amount = { + "اتوبوس": 7000, + "مینی بوس": 2000, +} const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type}) => { const t = useTranslations(); const [selectedImage, setSelectedImage] = useState(""); @@ -17,21 +21,13 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type}) => const [showAddIcon, setShowAddIcon] = useState(true); const requestServer = useRequest({auth: true}) const {update_notification} = useNotification() - let max_amount_number - if (vehicle_type === "اتوبوس") { - max_amount_number = 7000 - } else if (vehicle_type === "مینی بوس") { - max_amount_number = 2000 - } else { - max_amount_number = 5000 - } const validationSchema = Yup.object().shape({ proposed_amount: Yup.mixed().test( "is-number", `${t("ConfirmDialog.proposed_amount_number")}`, (value) => !isNaN(value) - ).test("max-amount", `${t("MachinaryOffice.max_amount", {value: parseInt(max_amount_number / 10).toLocaleString('en')})}`, - (value) => value <= max_amount_number) + ).test("max-amount", `${t("MachinaryOffice.max_amount", {value: parseInt(vehicle_amount[vehicle_type]).toLocaleString('en')})}`, + (value) => value <= vehicle_amount[vehicle_type]) .test("positive", `${t("ConfirmDialog.proposed_amount_positive")}`, (value) => value >= 0) .required(t("ConfirmDialog.proposed_amount_error")), confirm_img: Yup.mixed() diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx index ade15d7..f0a8c12 100644 --- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx @@ -9,6 +9,10 @@ import {useState} from "react"; import PriceField from "@/core/components/PriceField"; import * as Yup from "yup"; +const vehicle_amount = { + "اتوبوس": 7000, + "مینی بوس": 2000, +} const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) => { const t = useTranslations(); const [selectedImage, setSelectedImage] = useState(""); @@ -17,22 +21,14 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) => const [showAddIcon, setShowAddIcon] = useState(true); const requestServer = useRequest({auth: true}) const {update_notification} = useNotification() - let max_amount_number - if (vehicle_type === "اتوبوس") { - max_amount_number = 7000 - } else if (vehicle_type === "مینی بوس") { - max_amount_number = 2000 - } else { - max_amount_number = 5000 - } const validationSchema = Yup.object().shape({ approved_amount: Yup.mixed().test( "is-number", `${t("ConfirmDialog.approved_amount_number")}`, (value) => !isNaN(value) - ).test("max-amount", `${t("PassengerBoss.max_amount", {value: parseInt(max_amount_number / 10).toLocaleString('en')})}`, - (value) => value <= max_amount_number) + ).test("max-amount", `${t("PassengerBoss.max_amount", {value: parseInt(vehicle_amount[vehicle_type]).toLocaleString('en')})}`, + (value) => value <= vehicle_amount[vehicle_type]) .test("positive", `${t("ConfirmDialog.approved_amount_positive")}`, (value) => value >= 0) .required(t("ConfirmDialog.approved_amount_error")), confirm_img: Yup.mixed()