Feature/edit followup

src/components/dashboard/navgan/add-request-loan/forms/LegalPersonDatePicker.jsx

@@ -1,101 +0,0 @@
-import { FormControl, FormHelperText } from "@mui/material";
-import Button from "@mui/material/Button";
-import { AdapterDateFnsJalali } from "@mui/x-date-pickers/AdapterDateFnsJalali";
-import { DatePicker } from "@mui/x-date-pickers/DatePicker";
-import { LocalizationProvider } from "@mui/x-date-pickers/LocalizationProvider";
-import { faIR } from "@mui/x-date-pickers/locales";
-import moment from "jalali-moment";
-import { useTranslations } from "next-intl";
-import { useState } from "react";
-
-function ButtonField(props) {
-    const t = useTranslations();
-    const {
-        setOpen,
-        label,
-        id,
-        disabled,
-        InputProps: { ref } = {},
-        inputProps: { "aria-label": ariaLabel } = {},
-    } = props;
-
-    return (
-        <Button
-            sx={{ width: "100%", padding: 0.8 }}
-            variant="outlined"
-            color={
-                props.slotProps.formik.touched.company_date &&
-                    Boolean(props.slotProps.formik.errors.company_date)
-                    ? "error"
-                    : "primary"
-            }
-            id={id}
-            disabled={disabled}
-            ref={ref}
-            aria-label={ariaLabel}
-            onClick={() => setOpen?.((prev) => !prev)}
-        >
-            {label ? `${t("company_date")}: ${label}` : `${t("company_date")}`}
-        </Button>
-    );
-}
-
-function ButtonDatePicker(props) {
-    const t = useTranslations();
-    const [open, setOpen] = useState(false);
-    return (
-        <DatePicker
-            slots={{ field: ButtonField, ...props.slots }}
-            disabled={props.disabled}
-            slotProps={{
-                formik: props.formik,
-                field: { setOpen },
-                textField: {
-                    helperText: props.formik.errors.company_date
-                        ? `${t("company_date")}`
-                        : null,
-                },
-            }}
-            {...props}
-            open={open}
-            disableFuture
-            onClose={() => setOpen(false)}
-            onOpen={() => setOpen(true)}
-        />
-    );
-}
-
-const LegalPersonDatePicker = ({ formik, disabled }) => {
-    return (
-        <FormControl variant={"outlined"} fullWidth size="small" error={true}>
-            <LocalizationProvider
-                dateAdapter={AdapterDateFnsJalali}
-                localeText={{
-                    ...faIR.components.MuiLocalizationProvider.defaultProps.localeText,
-                    okButtonLabel: "تایید",
-                }}
-            >
-                <ButtonDatePicker
-                    label={
-                        formik.values.company_date !== "" &&
-                        formik.values.company_date?.locale("fa").format("YYYY/MM/DD")
-                    }
-                    value={
-                        formik.values.company_date !== ""
-                            ? formik.values.company_date?.toDate()
-                            : null
-                    }
-                    formik={formik}
-                    disabled={disabled}
-                    onChange={(newValue) => {
-                        formik.setFieldValue("company_date", moment(newValue));
-                    }}
-                />
-            </LocalizationProvider>
-            <FormHelperText>
-                {formik.touched.company_date && formik.errors.company_date}
-            </FormHelperText>
-        </FormControl>
-    );
-}
-export default LegalPersonDatePicker

src/components/dashboard/navgan/add-request-loan/forms/LegalPersonForm.jsx

@@ -22,10 +22,10 @@ import * as Yup from "yup";
 import {SEND_LOAN_REQUEST_NAVGAN} from "@/core/data/apiRoutes";
 import DataSaverOnIcon from "@mui/icons-material/DataSaverOn";
 import {useFormik} from "formik";
-import LegalPersonDatePicker from "@/components/dashboard/navgan/add-request-loan/forms/LegalPersonDatePicker";
 import useProjectTitle from "@/lib/app/hooks/useProjectTitle";
 import useActivityType from "@/lib/app/hooks/useActivityType";
 import MuiDatePicker from "@/core/components/MuiDatePicker";
+import LegalPersonDatePicker from "@/core/components/LegalPersonDatePicker";
 
 const LegalPersonForm = ({setFinishLoanRequest}) => {
     const t = useTranslations();

src/components/dashboard/navgan/show/form/UpdateFormLegal.jsx

@@ -17,8 +17,8 @@ import {useEffect} from "react";
 import EditIcon from '@mui/icons-material/Edit';
 import * as React from "react";
 import useProjectTitle from "@/lib/app/hooks/useProjectTitle";
-import LegalPersonDatePicker from "@/components/dashboard/navgan/add-request-loan/forms/LegalPersonDatePicker";
 import useActivityType from "@/lib/app/hooks/useActivityType";
+import LegalPersonDatePicker from "@/core/components/LegalPersonDatePicker";
 const UpdateFormLegal = ({LoanDetails, LoanId}) => {
     const t = useTranslations();
     const provinceStates = useProvince();
@@ -40,8 +40,8 @@ const UpdateFormLegal = ({LoanDetails, LoanId}) => {
         address: LoanDetails.address,
         company_name: LoanDetails.company_name,
         register_number: LoanDetails.register_number,
-        company_date: LoanDetails.company_register_date,
-        birthday: moment(LoanDetails.birthday),
+        company_date: LoanDetails.company_register_date ? moment(LoanDetails.company_register_date) : "",
+        birthday: LoanDetails.birthday ? moment(LoanDetails.birthday) : "",
         navgan_id: LoanDetails.navgan_id,
         province_id: LoanDetails.province_id,
         city_id: LoanDetails.city_id,
@@ -154,7 +154,6 @@ const UpdateFormLegal = ({LoanDetails, LoanId}) => {
         validationSchema,
         onSubmit: handleSubmit,
     });
-    console.log(formik.values.activity_type)
     return (<>
         <Box sx={{width: "80%", my: 2}}>
             <Divider>
@@ -563,7 +562,7 @@ const UpdateFormLegal = ({LoanDetails, LoanId}) => {
                         label={t("ShowLoan.text_field_province_id")}
                         size="small"
                         variant="outlined"
-                        disabled={LoanDetails.state_id !== 17}
+                        disabled
                         value={formik.values.province_id}
                         selectType="province_id"
                         schema={{value: "value", name: "name"}}

src/components/dashboard/navgan/show/form/UpdateFormReal.jsx

@@ -36,7 +36,7 @@ const UpdateFormReal = ({LoanDetails, LoanId}) => {
         navgan_plan_id: LoanDetails.navgan_plan_id,
         postal_code: LoanDetails.postal_code,
         address: LoanDetails.address,
-        birthday: moment(LoanDetails.birthday),
+        birthday: LoanDetails.birthday ? moment(LoanDetails.birthday) : "",
         navgan_id: LoanDetails.navgan_id,
         province_id: LoanDetails.province_id,
         city_id: LoanDetails.city_id,
@@ -460,7 +460,7 @@ const UpdateFormReal = ({LoanDetails, LoanId}) => {
                         label={t("ShowLoan.text_field_province_id")}
                         size="small"
                         variant="outlined"
-                        disabled={LoanDetails.state_id !== 17}
+                        disabled
                         value={formik.values.province_id}
                         selectType="province_id"
                         schema={{value: "value", name: "name"}}