diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json
index 1da70b3..351fcec 100644
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -358,19 +358,19 @@
"description": "توضیحات خود را وارد نمائید",
"choose_file": "انتخاب فایل",
"approved_amount": "مبلغ تصویب شده",
- "sakht_amount": "دوره ساخت",
- "tanafos_amount": "دوره تنفس",
+ "sakht_period": "دوره ساخت",
+ "tanafos_period": "دوره تنفس",
"approved_amount_error": "وارد کردن مبلغ تصویب شده الزامیست",
- "sakht_amount_error": "وارد کردن دوره ساخت الزامیست",
- "tanafos_amount_error": "وارد کردن دوره تنفس الزامیست",
+ "sakht_period_error": "وارد کردن دوره ساخت الزامیست",
+ "tanafos_period_error": "وارد کردن دوره تنفس الزامیست",
"approved_amount_positive": "مبلغ تصویب شده باید مثبت باشد",
"approved_amount_number": "مبلغ تصویب شده باید عدد باشد",
- "sakht_amount_number": "دوره ساخت باید عدد باشد",
- "tanafos_amount_number": "دوره تنفس باید عدد باشد",
+ "sakht_period_number": "دوره ساخت باید عدد باشد",
+ "tanafos_period_number": "دوره تنفس باید عدد باشد",
"toman": "میلیون تومان",
- "tanafos_amount_month": "ماه",
+ "tanafos_period_month": "ماه",
"approved_amount_title": "مبلغ تصویب شده کارگروه",
- "sakht_amount_day": "روز",
+ "sakht_period_day": "روز",
"proposed_amount_error": "وارد کردن مقدار پیشنهادی الزامیست",
"proposed_amount": "مبلغ پیشنهادی",
"proposed_amount_positive": "مقدار پیشنهادی باید مثبت باشد",
diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx
index 98f5a32..9dc919c 100644
--- a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx
+++ b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx
@@ -81,14 +81,14 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type, hand
(value) => value <= vehicle_amount[vehicle_type])
.test("positive", `${t("ConfirmDialog.proposed_amount_positive")}`, (value) => value >= 0)
.required(t("ConfirmDialog.proposed_amount_error")),
- sakht_amount: Yup.mixed()
- .test("is-number", `${t("ConfirmDialog.sakht_amount_number")}`,
+ sakht_period: Yup.mixed()
+ .test("is-number", `${t("ConfirmDialog.sakht_period_number")}`,
(value) => !isNaN(value))
- .required(t("ConfirmDialog.sakht_amount_error")),
- tanafos_amount: Yup.mixed()
- .test("is-number", `${t("ConfirmDialog.tanafos_amount_number")}`,
+ .required(t("ConfirmDialog.sakht_period_error")),
+ tanafos_period: Yup.mixed()
+ .test("is-number", `${t("ConfirmDialog.tanafos_period_number")}`,
(value) => !isNaN(value))
- .required(t("ConfirmDialog.tanafos_amount_error")),
+ .required(t("ConfirmDialog.tanafos_period_error")),
confirm_img: Yup.mixed()
.required(t("MachinaryOffice.upload_file_required"))
.test('fileSize', `${t("MachinaryOffice.upload_file_unit")}`, (value) => {
@@ -104,15 +104,15 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type, hand
initialValues: {
description: "",
proposed_amount: "",
- sakht_amount: "",
- tanafos_amount: "",
+ sakht_period: "",
+ tanafos_period: "",
confirm_img: null
}, validationSchema,
onSubmit: (values, {setSubmitting}) => {
const formData = new FormData();
formData.append("proposed_amount", values.proposed_amount);
- formData.append("sakht_amount", values.sakht_amount);
- formData.append("tanafos_amount", values.tanafos_amount);
+ formData.append("sakht_period", values.sakht_period);
+ formData.append("tanafos_period", values.tanafos_period);
if (values.description != "") formData.append("expert_description", values.description);
if (values.confirm_img != null) formData.append("attachment", values.confirm_img);
requestServer(`${CONFIRM_MACHINARY_OFFICE}/${rowId}`, 'post', {
@@ -220,49 +220,49 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type, hand
{t("ConfirmDialog.sakht_amount_day")},
+ position="end">{t("ConfirmDialog.sakht_period_day")},
}}
/>
{t("ConfirmDialog.tanafos_amount_month")},
+ position="end">{t("ConfirmDialog.tanafos_period_month")},
}}
/>
diff --git a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx
index 61fff69..f60e371 100644
--- a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx
+++ b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx
@@ -156,13 +156,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
/>
{renderCustomAccordions()}
>
diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx
index ed81b6b..f54c020 100644
--- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx
+++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx
@@ -173,13 +173,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand
/>
{renderCustomAccordions()}
>
diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx
index 654f0ed..4934d8e 100644
--- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx
+++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx
@@ -161,13 +161,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
/>
{renderCustomAccordions()}
>
diff --git a/src/core/components/NumberShowBox.jsx b/src/core/components/NumberShowBox.jsx
index 9f6f5ba..528cf0b 100644
--- a/src/core/components/NumberShowBox.jsx
+++ b/src/core/components/NumberShowBox.jsx
@@ -1,7 +1,6 @@
import {Box, Typography} from "@mui/material";
const NumberShowBox = ({showNumber, headerTitle, unitTitle}) => {
- console.log({showNumber})
return (
<>