loan/user-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v1.10.2'

Browse Source
This commit is contained in:
AmirHossein Mahmoodi
2023-11-05 16:46:33 +03:30
parent ee6329ee60 e1a804659c
commit d7f8a53823
10 changed files with 34 additions and 9286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
example.env.local
View File

@@ -1,5 +1,5 @@
NEXT_PUBLIC_API_NAME = "Loan Facilities Dashboard"
NEXT_PUBLIC_API_VERSION = "1.8.0"
NEXT_PUBLIC_API_VERSION = "1.10.2"
NEXT_PUBLIC_DEFAULT_LANGUAGE = "fa"
NEXT_PUBLIC_DEFAULT_DIRECTION = "rtl"

9223
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
public/locales/fa/app.json
View File

@@ -140,7 +140,7 @@
"text_field_enter_your_province_id": "استان خود را وارد کنید",
"text_field_navgan_id": "شماره ناوگان",
"text_field_enter_your_navgan_id": "شماره ناوگان خود را وارد کنید",
"text_field_national_id": "کد ملی",
"text_field_national_code": "کد ملی",
"text_field_enter_your_national_id": "کد ملی خود را وارد کنید",
"text_field_shenasname_id": "شماره شناسنامه",
"text_field_enter_your_shenasname_id": "شماره شناسنامه خود را وارد کنید",

18
src/components/dashboard/navgan/add-request-loan/forms/AddForm.jsx
View File

@@ -81,7 +81,7 @@ const AddFormComponent = () => {
phone_number: "",
vehicle_type: "",
plate_number: "",
province: "",
province_id: "",
navgan_id: "",
national_code: "",
shenasname_id: "",
@@ -103,7 +103,7 @@ const AddFormComponent = () => {
t("LoanRequest.error_message_plate_number")
),
navgan_id: Yup.string().required(t("LoanRequest.error_message_navgan_id")),
province: Yup.string().required(t("LoanRequest.error_message_province")),
province_id: Yup.string().required(t("LoanRequest.error_message_province_id")),
national_code: Yup.string().required(
t("LoanRequest.error_message_national_code")
),
@@ -121,7 +121,7 @@ const AddFormComponent = () => {
formData.append("phone_number", values.phone_number);
formData.append("vehicle_type", values.vehicle_type);
formData.append("plate_number", values.plate_number);
formData.append("province_id", values.province);
formData.append("province_id", values.province_id);
formData.append("navgan_id", values.navgan_id);
formData.append("national_code", values.national_code);
formData.append("shenasname_id", values.shenasname_id);
@@ -303,20 +303,20 @@ const AddFormComponent = () => {
}}
>
<Field
name="province"
label={t("LoanRequest.text_field_province")} // t("LoanRequest.text_field_enter_your_province")
name="province_id"
label={t("LoanRequest.text_field_province_id")} // t("LoanRequest.text_field_enter_your_province")
size="small"
selectType="province"
selectType="province_id"
component={SelectBox}
selectors={provinceList}
select={props.values.province}
select={props.values.province_id}
setFieldValue={props.setFieldValue}
setFieldTouched={props.setFieldTouched}
error={
props.touched.gender && props.errors.province ? true : false
props.touched.gender && props.errors.province_id ? true : false
}
helperText={
props.touched.gender ? props.errors.province : null
props.touched.gender ? props.errors.province_id : null
}
/>
</Box>

26
src/components/register/index.jsx
View File

@@ -51,19 +51,19 @@ const RegisterComponent = () => {
{t("register_navy")}
</Button>
</Grid>
<Grid item xs={12} sm={6} sx={{px: {xs: 0, sm: 1}}}>
<Button
sx={{whiteSpace: "nowrap"}}
variant="contained"
size="large"
component={NextLinkComposed}
to={{
pathname: "register/welfare-services",
}}
>
{t("register_welfare_services")}
</Button>
</Grid>
{/*<Grid item xs={12} sm={6} sx={{px: {xs: 0, sm: 1}}}>*/}
{/* <Button*/}
{/* sx={{whiteSpace: "nowrap"}}*/}
{/* variant="contained"*/}
{/* size="large"*/}
{/* component={NextLinkComposed}*/}
{/* to={{*/}
{/* pathname: "register/welfare-services",*/}
{/* }}*/}
{/* >*/}
{/* {t("register_welfare_services")}*/}
{/* </Button>*/}
{/*</Grid>*/}
</Grid>
</Box>
)}

22
src/components/register/navy/UserRegister.jsx
View File

@@ -29,7 +29,6 @@ const UserRegisterComponent = ({
verification_code: "",
phone_number: PhoneNumber,
national_id: "",
navgan_id: "",
};
const validationSchema = Yup.object().shape({
@@ -39,7 +38,6 @@ const UserRegisterComponent = ({
national_id: Yup.string().required(
t("RegisterPage.error_message_national_id")
),
navgan_id: Yup.string().required(t("RegisterPage.error_message_navgan_id")),
});
const handleSubmit = (values, props) => {
@@ -47,7 +45,6 @@ const UserRegisterComponent = ({
auth: false, data: {
type_id: values.type_id,
national_id: values.national_id,
navgan_id: values.navgan_id,
phone_number: values.phone_number,
verification_code: values.verification_code,
}
@@ -151,25 +148,6 @@ const UserRegisterComponent = ({
: null
}
/>
<Field
as={TextField}
name="navgan_id"
variant="outlined"
label={t("RegisterPage.text_field_navgan_id")}
placeholder={t(
"RegisterPage.text_field_enter_your_navgan_id"
)}
type={"text"}
error={
!!(props.touched.navgan_id && props.errors.navgan_id)
}
fullWidth
helperText={
props.touched.navgan_id
? props.errors.navgan_id
: null
}
/>
<Button
fullWidth
type="submit"

8
src/pages/dashboard/refahi/add-request-loan/index.jsx
View File

@@ -1,15 +1,13 @@
import WithAuthMiddleware from "@/middlewares/WithAuth";
import {parse} from "next-useragent";
import UserTypeMiddleware from "@/middlewares/UserType";
import LoanRequestComponent from "@/components/dashboard/refahi/add-request-loan";
const user_type = 2;
export default function AddLoanRequest() {
return (
<WithAuthMiddleware>
<UserTypeMiddleware user_type={user_type}>
<LoanRequestComponent/>
</UserTypeMiddleware>
{/*<UserTypeMiddleware user_type={user_type}>*/}
{/* <LoanRequestComponent/>*/}
{/*</UserTypeMiddleware>*/}
</WithAuthMiddleware>
);
}

8
src/pages/dashboard/refahi/edit-request-loan/[id].jsx
View File

@@ -1,15 +1,13 @@
import WithAuthMiddleware from "@/middlewares/WithAuth";
import {parse} from "next-useragent";
import UserTypeMiddleware from "@/middlewares/UserType";
import LoanRequestComponent from "@/components/dashboard/refahi/edit-request-loan";
const user_type = 2;
export default function EditLoanRequest() {
return (
<WithAuthMiddleware>
<UserTypeMiddleware user_type={user_type}>
<LoanRequestComponent/>
</UserTypeMiddleware>
{/*<UserTypeMiddleware user_type={user_type}>*/}
{/* <LoanRequestComponent/>*/}
{/*</UserTypeMiddleware>*/}
</WithAuthMiddleware>
);
}

8
src/pages/dashboard/refahi/followUp-loan/index.jsx
View File

@@ -1,15 +1,13 @@
import WithAuthMiddleware from "@/middlewares/WithAuth";
import {parse} from "next-useragent";
import UserTypeMiddleware from "@/middlewares/UserType";
import LoanFollowUpComponent from "@/components/dashboard/refahi/followUp-loan";
const user_type = 2;
export default function FollowUpLoan() {
return (
<WithAuthMiddleware>
<UserTypeMiddleware user_type={user_type}>
<LoanFollowUpComponent/>
</UserTypeMiddleware>
{/*<UserTypeMiddleware user_type={user_type}>*/}
{/* <LoanFollowUpComponent/>*/}
{/*</UserTypeMiddleware>*/}
</WithAuthMiddleware>
);
}

3
src/pages/register/welfare-services/index.jsx
View File

@@ -1,11 +1,10 @@
import WelfareServicesComponent from "@/components/register/welfare-services";
import WithoutAuthMiddleware from "@/middlewares/WithoutAuth";
import {parse} from "next-useragent";
export default function Register() {
return (
<WithoutAuthMiddleware>
<WelfareServicesComponent/>
{/*<WelfareServicesComponent/>*/}
</WithoutAuthMiddleware>
);
}