diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json
index 36ac7fb..0c4efd3 100644
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -75,7 +75,8 @@
"dashboard": "داشبورد",
"add-request-loan": "درخواست وام",
"followUp-loan": "پیگیری درخواست",
- "edit-request-loan": "ویرایش درخواست وام"
+ "edit-request-loan": "ویرایش درخواست وام",
+ "show": "نمایش"
},
"Authorization": {
"typography_your_login_is_valid_and_you_do_not_need_to_login_again": "شما دسترسی لازم به این صفحه را دارید نیاز به ورود مجدد نیست.",
@@ -210,26 +211,48 @@
"error_message_city_id": "لطفا شهر خود را وارد کنید!",
"add_loan_request_permission": "اکنون امکان ثبت درخواست جدید برای شما مقدور نیست"
},
- "showLoan": {
- "show_loan_page": "نمایش وام",
- "text_field_national_code": "کد ملی",
+ "ShowLoan": {
+ "show_loan_page": "نمایش وام | ناوگان",
+ "loading_show_component": "درحال دریافت اطلاعات درخواست...",
+ "tel_number_max": "شماره ثابت می بایست 11 رقم باشد",
+ "text_field_national_id": "کد ملی",
"text_field_postal_code": "کد پستی",
- "text_field_national_card_serial_num": "سریال پشت کارت ملی",
+ "text_field_national_serial_number": "سریال پشت کارت ملی",
"text_field_address": "آدرس",
- "text_field_birth_date": "تاریخ تولد",
+ "text_field_birthday": "تاریخ تولد",
"text_field_navgan_id": "کد ناوگان",
- "text_field_enter_your_national_code": "کد ملی خود را وارد کنید",
- "text_field_enter_your_postal_code": "کد پستی خود را وارد کنید",
- "text_field_enter_your_national_card_serial_num": "سریال پشت کارت ملی خود را وارد کنید",
- "text_field_enter_your_address": "آدرس خود را وارد کنید",
- "text_field_enter_your_birth_date": "تاریخ تولد خود را وارد کنید",
- "text_field_enter_your_navgan_id": "کد ناوگان خود را وارد کنید",
- "error_message_national_code": "لطفا کد ملی خود را وارد کنید!",
- "error_message_postal_code": "لطفا کد پستی خود را وارد کنید!",
- "error_message_national_card_serial_num": "لطفا سریال پشت کارت ملی خود را وارد کنید!",
- "error_message_address": "لطفا آدرس خود را وارد کنید!",
- "error_message_birth_date": "لطفا تاریخ تولد خود را وارد کنید!",
- "error_message_navgan_id": "لطفا کد ناوگان خود را وارد کنید!",
+ "text_field_province_id": "استان",
+ "text_field_education_id": "تحصیلات",
+ "text_field_occupation_id": "شغل",
+ "text_field_name": "نام کامل مالک",
+ "text_field_navgan_type": "نوع ناوگان",
+ "text_field_vehicle_type": "نوع وسیله",
+ "text_field_tel_number": "شماره ثابت (با پیش شماره استان)",
+ "text_field_enter_your_national_id": "کد ملی را وارد کنید",
+ "text_field_enter_your_postal_code": "کد پستی را وارد کنید",
+ "text_field_enter_your_national_serial_number": "سریال پشت کارت ملی را وارد کنید",
+ "text_field_enter_your_address": "آدرس را وارد کنید",
+ "text_field_enter_your_tel_number": "شماره ثابت (با پیش شماره استان) خود را وارد کنید",
+ "text_field_enter_your_birthday": "تاریخ تولد را وارد کنید",
+ "text_field_enter_your_navgan_id": "کد ناوگان را وارد کنید",
+ "text_field_enter_your_name": "نام کامل مالک را وارد کنید",
+ "postal_code_max": "کد پستی می بایست 10 رقم باشد",
+ "error_message_postal_code": "لطفا کد پستی را وارد کنید!",
+ "error_message_national_serial_number": "لطفا سریال پشت کارت ملی را وارد کنید!",
+ "error_message_address": "لطفا آدرس را وارد کنید!",
+ "error_message_birthday": "لطفا تاریخ تولد را وارد کنید!",
+ "error_message_navgan_id": "لطفا کد ناوگان را وارد کنید!",
+ "error_message_province_id": "لطفا استان را وارد کنید!",
+ "error_message_city_id": "لطفا شهر خود را وارد کنید!",
+ "error_message_name": "لطفا نام کامل مالک را وارد کنید!",
+ "error_message_date_of_birth": "لطفا تاریخ تولد خود را وارد کنید!",
+ "error_message_navgan_type": "لطفا نوع ناوگان را وارد کنید!",
+ "error_message_vehicle_type": "لطفا نوع وسیله را وارد کنید!",
+ "error_message_fixed_number": "لطفا تلفن ثابت را وارد کنید!",
+ "error_message_tel_number": "لطفا شماره ثابت (با پیش شماره استان) خود را وارد کنید!",
+ "error_message_occupation_id": "لطفا کد شغل (با توجه به مستندات ارائه شده) را به درستی وارد کنید!",
+ "error_message_education_id": "لطفا تحصیلات (با توجه به مستندات ارائه شده) را به درستی وارد کنید!",
+ "cityList_empty": "شهر یافت نشد",
"button_submit": "ویرایش"
},
"EditLoanRequest": {
diff --git a/src/components/dashboard/navgan/add-request-loan/index.jsx b/src/components/dashboard/navgan/add-request-loan/index.jsx
index 395ede7..3e4cf0c 100644
--- a/src/components/dashboard/navgan/add-request-loan/index.jsx
+++ b/src/components/dashboard/navgan/add-request-loan/index.jsx
@@ -1,6 +1,7 @@
import {Box, Chip, Divider} from "@mui/material";
import {useTranslations} from "next-intl";
import AddFormComponent from "@/components/dashboard/navgan/add-request-loan/forms/AddForm";
+import {CenterLayout, useUser} from "@witel/webapp-builder";
const LoanRequestComponent = () => {
const t = useTranslations();
diff --git a/src/components/dashboard/navgan/show/form/UpdateForm.jsx b/src/components/dashboard/navgan/show/form/UpdateForm.jsx
new file mode 100644
index 0000000..3d2abe7
--- /dev/null
+++ b/src/components/dashboard/navgan/show/form/UpdateForm.jsx
@@ -0,0 +1,658 @@
+import StyledForm from "@/core/components/StyledForm";
+import {Box, Button, Chip, Divider, Stack, TextField} from "@mui/material";
+import {Field, Formik} from "formik";
+import {useTranslations} from "next-intl";
+import EditIcon from '@mui/icons-material/Edit';
+import * as Yup from "yup";
+import SelectBox from "@/core/components/SelectBox";
+import PlateNumber from "@/core/components/PlateNumber";
+import MuiDatePicker from "@/core/components/MuiDatePicker";
+import moment from "jalali-moment";
+import useProvince from "@/lib/app/hooks/useProvince";
+import useCities from "@/lib/app/hooks/useCities";
+import UseEducations from "@/lib/app/hooks/useEducations";
+import useOccupations from "@/lib/app/hooks/useOccupations";
+import {UPDATE_LOAN} from "@/core/data/apiRoutes";
+import {useRequest} from "@witel/webapp-builder";
+import {useRouter} from "next/router";
+import {useEffect} from "react";
+
+const UpdateForm = ({LoanDetails, LoanId}) => {
+ const t = useTranslations();
+ const provinceStates = useProvince();
+ const router = useRouter()
+ const citiesStates = useCities();
+ const educationStates = UseEducations();
+ const occupationStates = useOccupations();
+ const requestServer = useRequest();
+
+ useEffect(() => {
+ citiesStates.setProvinceID(LoanDetails.province_id)
+ }, [provinceStates]);
+
+ // initial values
+ const initialValues = {
+ national_id: LoanDetails.national_id,
+ postal_code: LoanDetails.postal_code,
+ national_serial_number: LoanDetails.national_serial_number,
+ address: LoanDetails.address,
+ birthday: moment(LoanDetails.birthday),
+ navgan_id: LoanDetails.navgan_id,
+ province_id: LoanDetails.province_id,
+ city_id: LoanDetails.city_id,
+ name: LoanDetails.name,
+ navgan_type: LoanDetails.navgan_type,
+ vehicle_type: LoanDetails.vehicle_type,
+ telephone_number: LoanDetails.telephone_number,
+ plate_part1: LoanDetails.plate_number.split("-")[0],
+ plate_part2: LoanDetails.plate_number.split("-")[1],
+ plate_part3: LoanDetails.plate_number.split("-")[2],
+ plate_part4: LoanDetails.plate_number.split("-")[3],
+ education_id: LoanDetails.education_id,
+ occupation_id: LoanDetails.occupation_id,
+ };
+ // end initial values
+
+ // validation
+ const validationSchema = Yup.object().shape({
+ postal_code: Yup.mixed()
+ .test("max", `${t("ShowLoan.postal_code_max")}`, (value) => value.toString().length === 10)
+ .required(
+ t("ShowLoan.error_message_postal_code")
+ ),
+ address: Yup.string().required(t("ShowLoan.error_message_address")),
+ province_id: Yup.string().required(t("ShowLoan.error_message_province_id")),
+ city_id: Yup.string().required(t("ShowLoan.error_message_city_id")),
+ telephone_number: Yup.mixed()
+ .test("max", `${t("ShowLoan.tel_number_max")}`, (value) => {
+ const stringValue = String(value);
+ return stringValue.length === 11
+ })
+ .required(t("ShowLoan.error_message_tel_number")),
+ occupation_id: Yup.string().required(t("ShowLoan.error_message_occupation_id")),
+ education_id: Yup.string().required(t("ShowLoan.error_message_education_id")),
+ birthday: Yup.string().required(t("ShowLoan.error_message_date_of_birth")),
+
+ });
+ // end validation
+
+ // submit
+ const handleSubmit = async (values, props) => {
+ props.setSubmitting(true)
+ const formData = new FormData();
+ formData.append("postal_code", values.postal_code);
+ formData.append("address", values.address);
+ formData.append("province_id", values.province_id);
+ formData.append("city_id", values.city_id);
+ formData.append("telephone_number", values.telephone_number);
+ formData.append("occupation_id", values.occupation_id);
+ formData.append("education_id", values.education_id);
+ formData.append("national_serial_number", values.national_serial_number);
+ formData.append("birthday", values.birthday.locale('en').format("YYYY-MM-DD"));
+ await requestServer(UPDATE_LOAN + LoanId, "post", {
+ auth: true, notification: true, data: formData
+ }).then(() => {
+ router.push("/dashboard/navgan/followUp-loan")
+ }).catch(() => {
+ }).finally(() => {
+ props.setSubmitting(false)
+ })
+
+ };
+ // end submit
+
+ return (
+ <>
+
+
+
+
+
+
+ {(props) => (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ props.setFieldValue('navgan_type', event.target.value)
+ }}
+ setFieldTouched={props.setFieldTouched}
+ error={props.touched.navgan_type && Boolean(props.errors.navgan_type)}
+ helperText={props.touched.navgan_type && props.errors.navgan_type}
+ onBlur={props.handleBlur("navgan_type")}
+ />
+
+
+
+
+
+
+
+ props.setFieldValue('vehicle_type', event.target.value)}
+ error={props.touched.vehicle_type && Boolean(props.errors.vehicle_type)}
+ helperText={props.touched.vehicle_type && props.errors.vehicle_type}
+ onBlur={props.handleBlur("vehicle_type")}
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {provinceStates.provinceList.length !== 0 ?
+ {
+ props.setFieldValue('province_id', event.target.value);
+ citiesStates.setProvinceID(event.target.value)
+ props.setFieldTouched("city_id", false, false);
+ props.setFieldValue("city_id", "")
+ }}
+ setFieldTouched={props.setFieldTouched}
+ error={props.touched.province_id && Boolean(props.errors.province_id)}
+ helperText={props.touched.province_id && props.errors.province_id}
+ onBlur={props.handleBlur("province_id")}
+ /> : }
+
+
+
+ {citiesStates.cityList.length !== 0 ?
+ props.setFieldValue('city_id', event.target.value)}
+ setFieldTouched={props.setFieldTouched}
+ error={props.touched.city_id && Boolean(props.errors.city_id)}
+ helperText={props.touched.city_id && props.errors.city_id}
+ onBlur={props.handleBlur("city_id")}
+ /> : }
+
+
+
+
+
+
+
+ {educationStates.educationsList.length !== 0 ?
+ {
+ props.setFieldValue('education_id', event.target.value)
+ }}
+ setFieldTouched={props.setFieldTouched}
+ error={props.touched.education_id && Boolean(props.errors.education_id)}
+ helperText={props.touched.education_id && props.errors.education_id}
+ onBlur={props.handleBlur("education_id")}
+ /> : }
+
+
+ {occupationStates.occupationsList.length !== 0 ?
+ {
+ props.setFieldValue('occupation_id', event.target.value)
+ }}
+ setFieldTouched={props.setFieldTouched}
+ error={props.touched.occupation_id && Boolean(props.errors.occupation_id)}
+ helperText={props.touched.occupation_id && props.errors.occupation_id}
+ onBlur={props.handleBlur("occupation_id")}
+ /> : }
+
+
+
+
+
+
+
+
+
+
+
+
+ )}
+
+
+ );
+};
+
+export default UpdateForm;
diff --git a/src/components/dashboard/navgan/show/form/index.jsx b/src/components/dashboard/navgan/show/form/index.jsx
index a1f237f..7a6f74a 100644
--- a/src/components/dashboard/navgan/show/form/index.jsx
+++ b/src/components/dashboard/navgan/show/form/index.jsx
@@ -1,263 +1,34 @@
-import StyledForm from "@/core/components/StyledForm";
-import {Box, Button, Stack, TextField} from "@mui/material";
-import {Field, Formik} from "formik";
+import UpdateForm from "@/components/dashboard/navgan/show/form/UpdateForm";
+import {useEffect, useState} from "react";
+import {GET_LOAN_DETAILS} from "@/core/data/apiRoutes";
+import {useRouter} from "next/router";
+import {SvgLoading, useRequest} from "@witel/webapp-builder";
+import {Stack, Typography} from "@mui/material";
import {useTranslations} from "next-intl";
-import EditIcon from '@mui/icons-material/Edit';
-import * as Yup from "yup";
const ShowLoanForm = () => {
const t = useTranslations();
+ const {query} = useRouter();
+ const requestServer = useRequest({auth: true, notification: false});
+ const [LoanDetails, setLoanDetails] = useState({});
- // initial values
- const initialValues = {
- national_code: "0312288875",
- postal_code: "326585475",
- national_card_serial_num: "0312288875",
- address: "تهران - ثنایی - مطهری ساختمان مهتاب",
- birth_date: "10/25/44",
- navgan_id: "14575"
- };
- // end initial values
-
- // validation
- const validationSchema = Yup.object().shape({
- national_code: Yup.string().required(t("showLoan.error_message_national_code")),
- postal_code: Yup.string().required(t("showLoan.error_message_postal_code")),
- national_card_serial_num: Yup.string().required(t("showLoan.error_message_national_card_serial_num")),
- address: Yup.string().required(t("showLoan.error_message_address")),
- birth_date: Yup.string().required(t("showLoan.error_message_birth_date")),
- navgan_id: Yup.string().required(t("showLoan.error_message_navgan_id")),
- });
- // end validation
-
- // submit
- const handleSubmit = async (values, props) => {
- const formData = new FormData();
- formData.append("national_code", values.national_code);
- formData.append("postal_code", values.postal_code);
- formData.append("national_card_serial_num", values.national_card_serial_num);
- formData.append("address", values.address);
- formData.append("birth_date", values.birth_date);
- formData.append("navgan_id", values.navgan_id);
- };
- // end submit
+ useEffect(() => {
+ requestServer(GET_LOAN_DETAILS + query.id, 'get', {auth: true, notification: false}).then(({data}) => {
+ setLoanDetails(data.data);
+ }).catch(() => {
+ })
+ }, []);
+ if (Object.keys(LoanDetails).length === 0) {
+ return (
+
+
+ {t("ShowLoan.loading_show_component")}
+
+ );
+ }
return (
-
- {(props) => (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- )}
-
+
);
};
diff --git a/src/components/dashboard/navgan/show/index.jsx b/src/components/dashboard/navgan/show/index.jsx
index ffab6b1..b9c73ed 100644
--- a/src/components/dashboard/navgan/show/index.jsx
+++ b/src/components/dashboard/navgan/show/index.jsx
@@ -1,4 +1,3 @@
-import {Box, Chip, Divider} from "@mui/material";
import {useTranslations} from "next-intl";
import {CenterLayout, useUser} from "@witel/webapp-builder";
import ShowLoanForm from "@/components/dashboard/navgan/show/form";
@@ -9,15 +8,6 @@ const ShowLoan = () => {
return (
-
-
-
-
-
);
diff --git a/src/core/components/MuiDatePicker.jsx b/src/core/components/MuiDatePicker.jsx
index accc7af..95df9e3 100644
--- a/src/core/components/MuiDatePicker.jsx
+++ b/src/core/components/MuiDatePicker.jsx
@@ -69,10 +69,10 @@ export default function PickerWithButtonField({formik, disabled}) {
>
{
diff --git a/src/core/components/SelectBox.jsx b/src/core/components/SelectBox.jsx
index 0ee7a47..6fc787c 100644
--- a/src/core/components/SelectBox.jsx
+++ b/src/core/components/SelectBox.jsx
@@ -13,14 +13,15 @@ function SelectBox({
disabled,
helperText,
isLoading,
- errorEcured
+ errorEcured,
+ variant = "outlined"
}) {
const t = useTranslations();
return (
{
return (
<>
diff --git a/src/pages/dashboard/navgan/[id]/show/index.jsx b/src/pages/dashboard/navgan/[id]/show/index.jsx
index 202aa4d..701f417 100644
--- a/src/pages/dashboard/navgan/[id]/show/index.jsx
+++ b/src/pages/dashboard/navgan/[id]/show/index.jsx
@@ -1,5 +1,6 @@
import {parse} from "next-useragent";
import ShowLoan from "@/components/dashboard/navgan/show";
+import {globalServerProps} from "@/core/utils/globalServerProps";
export default function ShowLoanRequest() {
return (
@@ -11,10 +12,8 @@ export async function getServerSideProps({req, locale}) {
const {isBot} = parse(req.headers["user-agent"]);
return {
props: {
- messages: (await import(`&/locales/${locale}/app.json`)).default,
- title: "showLoan.show_loan_page",
- isBot,
- locale,
+ ...await globalServerProps({req, locale}),
+ title: "ShowLoan.show_loan_page",
layout: {name: 'DashboardLayout'}
},
};