diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json
index 243d08b..7ef24ee 100644
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -474,6 +474,7 @@
},
"ConfirmDialog": {
"confirm": "ارجاع",
+ "month": "(ماه)",
"context": "آیا از تایید این آیتم اطمینان دارید؟",
"button-cancel": "بستن",
"button-confirm": "ارجاع",
@@ -513,17 +514,21 @@
"available_jobs_positive": "تعدلد اشتغال موجود باید مثبت باشد",
"approved_amount_number": "مبلغ تصویب شده باید عدد باشد",
"bank_facility_number": "تسهیلات سهم بانک باید عدد باشد",
+ "interest_rate_number": "نرخ بهره باید عدد باشد",
"government_facility_number": "تسهیلات سهم دولت باید عدد باشد",
"committed_employment_number": "تعداد سابقه استفاده از تسهیلات تکلیفی باید عدد باشد",
"history_facilities_number": "تعداد اشتغال تعهد شده باید عدد باشد",
"available_jobs_number": "تعداد اشتغال موجود باید عدد باشد",
"sakht_period_positive": "دوره ساخت باید مثبت باشد",
+ "interest_rate_positive": "نرخ بهره باید مثبت باشد",
"tanafos_period_positive": "دوره تنفس باید مثبت باشد",
"sakht_period_number": "دوره ساخت باید عدد باشد",
"repayment_period_number": "دوره باز پرداخت باید عدد باشد",
"participation_period_number": "دوره مشارکت باید عدد باشد",
"tanafos_period_number": "دوره تنفس باید عدد باشد",
"toman": "میلیون تومان",
+ "bank_facility_max_amount": "جمع مبلغ سهم دولت و سهم بانک نباید از مبلغ تصویب شده بیشتر باشد .",
+ "government_facility_max_amount": "جمع مبلغ سهم دولت و سهم بانک نباید از مبلغ تصویب شده بیشتر باشد .",
"tanafos_period_month": "ماه",
"approved_amount_title": "مبلغ تصویب شده کارگروه",
"sakht_period_day": "روز",
diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx
index da86c63..a0ea9cb 100644
--- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx
+++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx
@@ -22,6 +22,7 @@ const vehicle_amount = {
"اتوبوس": 7000,
"مینی بوس": 2000,
}
+
const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) => {
const t = useTranslations();
const [selectedImage, setSelectedImage] = useState("");
@@ -30,7 +31,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) =>
const [fileName, setFileName] = useState(null);
const [showAddIcon, setShowAddIcon] = useState(true);
const [expertFileType, setExpertFileType] = useState(null);
- const [expertfileName, setExpertFileName] = useState(null);
+ const [expertFileName, setExpertFileName] = useState(null);
const [showExpertAddIcon, setShowExpertAddIcon] = useState(true);
const requestServer = useRequest({auth: true, notification: false})
const {update_notification} = useNotification();
@@ -50,7 +51,25 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) =>
`${t("ConfirmDialog.bank_facility_number")}`,
(value) => !isNaN(value)
).test("positive", `${t("ConfirmDialog.bank_facility_positive")}`, (value) => value >= 0)
+ .test("max_bank", `${t("ConfirmDialog.bank_facility_max_amount")}`, function (value) {
+ const government_facility = this.parent.government_facility || 0;
+ const max_amount = (this.parent.approved_amount || 0) - government_facility;
+ return value <= max_amount;
+ })
.required(t("ConfirmDialog.bank_facility_error")),
+ government_facility: Yup.mixed()
+ .test(
+ "is-number",
+ `${t("ConfirmDialog.government_facility_number")}`,
+ (value) => !isNaN(value)
+ )
+ .test("positive", `${t("ConfirmDialog.government_facility_positive")}`, (value) => value >= 0)
+ .test("max_government", `${t("ConfirmDialog.government_facility_max_amount")}`, function (value) {
+ const bank_facility = this.parent.bank_facility || 0;
+ const max_amount = (this.parent.approved_amount || 0) - bank_facility;
+ return value <= max_amount;
+ })
+ .required(t("ConfirmDialog.government_facility_error")),
repayment_period: Yup.mixed().test(
"is-number",
`${t("ConfirmDialog.repayment_period_number")}`,
@@ -63,12 +82,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) =>
(value) => !isNaN(value)
).test("positive", `${t("ConfirmDialog.participation_period_positive")}`, (value) => value >= 0)
.required(t("ConfirmDialog.participation_period_error")),
- government_facility: Yup.mixed().test(
- "is-number",
- `${t("ConfirmDialog.government_facility_number")}`,
- (value) => !isNaN(value)
- ).test("positive", `${t("ConfirmDialog.government_facility_positive")}`, (value) => value >= 0)
- .required(t("ConfirmDialog.government_facility_error")),
+
committed_employment: Yup.mixed().test(
"is-number",
`${t("ConfirmDialog.committed_employment_number")}`,
@@ -91,7 +105,11 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) =>
(value) => !isNaN(value))
.test("positive", `${t("ConfirmDialog.tanafos_period_positive")}`, (value) => value > 0)
.required(t("ConfirmDialog.tanafos_period_error")),
- interest_rate: Yup.mixed().required(t("ConfirmDialog.interest_rate_error")),
+ interest_rate: Yup.mixed()
+ .test("is-number", `${t("ConfirmDialog.interest_rate_number")}`,
+ (value) => !isNaN(value))
+ .test("positive", `${t("ConfirmDialog.interest_rate_positive")}`, (value) => value > 0)
+ .required(t("ConfirmDialog.interest_rate_error")),
confirm_img: Yup.mixed().notRequired(t("ConfirmDialog.approved_amount_error"))
.test('fileSize', `${t("PassengerBoss.upload_file_unit")}`, (value) => {
if (!value) return true
@@ -117,9 +135,9 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) =>
initialValues: {
description: "",
approved_amount: "",
- bank_facility: "",
- government_facility: "",
- user_facility: "",
+ bank_facility: "0",
+ government_facility: "0",
+ user_facility: "0",
physical_progress: "",
repayment_period: "",
participation_period: "",
@@ -127,7 +145,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) =>
committed_employment: "",
sakht_period: "",
tanafos_period: "",
- history_facilities: "",
+ history_facilities: "0",
available_jobs: "",
expert_img: null,
confirm_img: null,
@@ -167,7 +185,6 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) =>
},
});
-
const handleUploadChange = (event) => {
const uploadedFile = event.target?.files?.[0];
if (uploadedFile) {
@@ -198,10 +215,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) =>
};
const handleAmountChange = (event) => {
if (!isNaN(event.target.value)) {
- formik.setFieldValue("approved_amount", event.target.value)
- setShowFacility(!showFacility)
+ formik.setFieldValue("approved_amount", event.target.value).then(() => {
+ formik.setFieldValue("user_facility", Number(event.target.value) - (Number(formik.values.bank_facility) + Number(formik.values.government_facility)))
+ })
+ event.target.value !== "" ? setShowFacility(true) : setShowFacility(false)
} else {
formik.setFieldValue("approved_amount", formik.values.approved_amount)
+ setShowFacility(false)
}
};
@@ -249,97 +269,85 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) =>
fullWidth
/>
- {showFacility ? (
- <>
-
-
- {t("ConfirmDialog.bank_facility")}{t("ConfirmDialog.unit")}>}
- type="text"
- inputProps={{
- inputMode: "number",
- min: 0,
- pattern: "[0-9]*",
- }}
- variant="outlined"
- value={formik.values.bank_facility}
- onChange={(event) => {
- if (!isNaN(event.target.value)) {
- formik.setFieldValue("bank_facility", event.target.value)
- } else {
- formik.setFieldValue("bank_facility", formik.values.bank_facility)
- }
- }}
- onBlur={formik.handleBlur("bank_facility")}
- error={
- formik.touched.bank_facility &&
- Boolean(formik.errors.bank_facility)
- }
- helperText={
- formik.touched.bank_facility && formik.errors.bank_facility
- }
- fullWidth
- />
-
-
-
- {t("ConfirmDialog.government_facility")}{t("ConfirmDialog.unit")}>}
- type="text"
- inputProps={{
- inputMode: "number",
- min: 0,
- pattern: "[0-9]*",
- }}
- variant="outlined"
- value={formik.values.government_facility}
- onChange={(event) => {
- if (!isNaN(event.target.value)) {
- formik.setFieldValue("government_facility", event.target.value)
- } else {
- formik.setFieldValue("government_facility", formik.values.government_facility)
- }
- }}
- onBlur={formik.handleBlur("government_facility")}
- error={
- formik.touched.government_facility &&
- Boolean(formik.errors.government_facility)
- }
- helperText={
- formik.touched.government_facility && formik.errors.government_facility
- }
- fullWidth
- />
-
-
-
- {t("ConfirmDialog.user_facility")}{t("ConfirmDialog.unit")}>}
- type="text"
- inputProps={{
- inputMode: "number",
- min: 0,
- pattern: "[0-9]*",
- }}
- variant="outlined"
- value={formik.values.user_facility}
- onChange={(event) => {
- if (!isNaN(event.target.value)) {
- formik.setFieldValue("user_facility", event.target.value)
- } else {
- formik.setFieldValue("user_facility", formik.values.user_facility)
- }
- }}
- onBlur={formik.handleBlur("user_facility")}
- disabled
- fullWidth
- />
-
- >
- ) : null}
+
+
+ {t("ConfirmDialog.bank_facility")}{t("ConfirmDialog.unit")}>}
+ type="text"
+ inputProps={{
+ inputMode: "number",
+ min: 0,
+ pattern: "[0-9]*",
+ }}
+ variant="outlined"
+ value={formik.values.bank_facility}
+ onChange={(event) => {
+ if (!isNaN(event.target.value)) {
+ formik.setFieldValue("bank_facility", event.target.value).then(() => {
+ formik.setFieldValue("user_facility", Number(formik.values.approved_amount) - (Number(event.target.value) + Number(formik.values.government_facility)))
+ })
+ } else {
+ formik.setFieldValue("bank_facility", formik.values.bank_facility)
+ }
+ }}
+ onBlur={formik.handleBlur("bank_facility")}
+ error={
+ formik.touched.bank_facility &&
+ Boolean(formik.errors.bank_facility)
+ }
+ helperText={
+ formik.touched.bank_facility && formik.errors.bank_facility
+ }
+ fullWidth
+ disabled={!showFacility}
+ />
+
+
+
+ {t("ConfirmDialog.government_facility")}{t("ConfirmDialog.unit")}>}
+ type="text"
+ inputProps={{
+ inputMode: "number",
+ min: 0,
+ pattern: "[0-9]*",
+ }}
+ variant="outlined"
+ value={formik.values.government_facility}
+ onChange={(event) => {
+ if (!isNaN(event.target.value)) {
+ formik.setFieldValue("government_facility", event.target.value).then(() => {
+ formik.setFieldValue("user_facility", Number(formik.values.approved_amount) - (Number(formik.values.bank_facility) + Number(event.target.value)))
+ })
+ } else {
+ formik.setFieldValue("government_facility", formik.values.government_facility)
+ }
+ }}
+ onBlur={formik.handleBlur("government_facility")}
+ error={
+ formik.touched.government_facility &&
+ Boolean(formik.errors.government_facility)
+ }
+ helperText={
+ formik.touched.government_facility && formik.errors.government_facility
+ }
+ disabled={!showFacility}
+ fullWidth
+ />
+
+
+
+ {t("ConfirmDialog.user_facility")}{t("ConfirmDialog.unit")}>}
+ variant="outlined"
+ value={formik.values.user_facility}
+ disabled
+ fullWidth
+ />
+
variant="outlined"
value={formik.values.interest_rate}
onChange={(event) => {
- if (!isNaN(event.target.value)) {
+ if (isNaN(event.target.value) || event.target.value > 100) formik.setFieldValue("interest_rate", formik.values.interest_rate)
+ else
formik.setFieldValue("interest_rate", event.target.value)
- } else {
- formik.setFieldValue("interest_rate", formik.values.interest_rate)
- }
}}
onBlur={formik.handleBlur("interest_rate")}
+ error={
+ formik.touched.interest_rate &&
+ Boolean(formik.errors.interest_rate)
+ }
+ helperText={
+ formik.touched.interest_rate && formik.errors.interest_rate
+ }
fullWidth
/>
+ {t("ConfirmDialog.repayment_period")} {t("ConfirmDialog.month")}>}
type="text"
inputProps={{
inputMode: "number",
@@ -406,7 +420,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) =>
formik.setFieldValue("repayment_period", formik.values.repayment_period)
}
}}
- onBlur={formik.handleBlur("repayment_period")}
+ onBlur={formik.handleBlur}
error={
formik.touched.repayment_period &&
Boolean(formik.errors.repayment_period)
@@ -420,7 +434,8 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) =>
+ {t("ConfirmDialog.participation_period")} {t("ConfirmDialog.month")}>}
type="text"
inputProps={{
inputMode: "number",
@@ -447,85 +462,6 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) =>
fullWidth
/>
-
- {
- if (!isNaN(event.target.value)) {
- formik.setFieldValue("committed_employment", event.target.value)
- } else {
- formik.setFieldValue("committed_employment", formik.values.committed_employment)
- }
- }}
- onBlur={formik.handleBlur("committed_employment")}
- error={
- formik.touched.committed_employment &&
- Boolean(formik.errors.committed_employment)
- }
- helperText={
- formik.touched.committed_employment && formik.errors.committed_employment
- }
- fullWidth
- />
-
-
- {
- if (!isNaN(event.target.value)) {
- formik.setFieldValue("available_jobs", event.target.value)
- } else {
- formik.setFieldValue("available_jobs", formik.values.available_jobs)
- }
- }}
- onBlur={formik.handleBlur("available_jobs")}
- error={
- formik.touched.available_jobs &&
- Boolean(formik.errors.available_jobs)
- }
- helperText={
- formik.touched.available_jobs && formik.errors.available_jobs
- }
- fullWidth
- />
-
-
- {
- formik.setFieldValue('history_facilities', event.target.value)
- }}
- setFieldTouched={formik.setFieldTouched}
- error={formik.touched.history_facilities && Boolean(formik.errors.history_facilities)}
- helperText={formik.touched.history_facilities && formik.errors.history_facilities}
- onBlur={formik.handleBlur("history_facilities")}
- />
-
onBlur={formik.handleBlur("tanafos_period")}
/>
+
+ {
+ if (!isNaN(event.target.value)) {
+ formik.setFieldValue("committed_employment", event.target.value)
+ } else {
+ formik.setFieldValue("committed_employment", formik.values.committed_employment)
+ }
+ }}
+ onBlur={formik.handleBlur("committed_employment")}
+ error={
+ formik.touched.committed_employment &&
+ Boolean(formik.errors.committed_employment)
+ }
+ helperText={
+ formik.touched.committed_employment && formik.errors.committed_employment
+ }
+ fullWidth
+ />
+
+
+ {
+ if (!isNaN(event.target.value)) {
+ formik.setFieldValue("available_jobs", event.target.value)
+ } else {
+ formik.setFieldValue("available_jobs", formik.values.available_jobs)
+ }
+ }}
+ onBlur={formik.handleBlur("available_jobs")}
+ error={
+ formik.touched.available_jobs &&
+ Boolean(formik.errors.available_jobs)
+ }
+ helperText={
+ formik.touched.available_jobs && formik.errors.available_jobs
+ }
+ fullWidth
+ />
+
+
+ {
+ formik.setFieldValue('history_facilities', event.target.value)
+ }}
+ setFieldTouched={formik.setFieldTouched}
+ error={formik.touched.history_facilities && Boolean(formik.errors.history_facilities)}
+ helperText={formik.touched.history_facilities && formik.errors.history_facilities}
+ onBlur={formik.handleBlur("history_facilities")}
+ />
+
{t("PassengerBoss.upload_expert_img")}
setFieldValue={formik.setFieldValue} // Remove props.setFieldValue, use formik.setFieldValue
fieldname="expert_img"
fileType={expertFileType}
- fileName={expertfileName}
+ fileName={expertFileName}
imageAlt={t("app_name")}
imageSize={[250, 150]}
onBlur={formik.handleBlur("expert_img")}