From c17a12339130b99cb2951f5225006a234d624c8c Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Sun, 5 Nov 2023 15:37:49 +0330 Subject: [PATCH 1/4] LFFE-11 remove navgan code input from its form and coment all about welfare services --- .../navgan/add-request-loan/forms/AddForm.jsx | 30 ------------------- src/components/register/index.jsx | 26 ++++++++-------- .../refahi/add-request-loan/index.jsx | 8 ++--- .../refahi/edit-request-loan/[id].jsx | 8 ++--- .../dashboard/refahi/followUp-loan/index.jsx | 8 ++--- src/pages/register/welfare-services/index.jsx | 3 +- 6 files changed, 23 insertions(+), 60 deletions(-) diff --git a/src/components/dashboard/navgan/add-request-loan/forms/AddForm.jsx b/src/components/dashboard/navgan/add-request-loan/forms/AddForm.jsx index 760fed1..6ce54e8 100644 --- a/src/components/dashboard/navgan/add-request-loan/forms/AddForm.jsx +++ b/src/components/dashboard/navgan/add-request-loan/forms/AddForm.jsx @@ -82,7 +82,6 @@ const AddFormComponent = () => { vehicle_type: "", plate_number: "", province: "", - navgan_id: "", national_code: "", shenasname_id: "", national_card_img: null, @@ -102,7 +101,6 @@ const AddFormComponent = () => { plate_number: Yup.string().required( 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")), national_code: Yup.string().required( t("LoanRequest.error_message_national_code") @@ -122,7 +120,6 @@ const AddFormComponent = () => { formData.append("vehicle_type", values.vehicle_type); formData.append("plate_number", values.plate_number); formData.append("province_id", values.province); - formData.append("navgan_id", values.navgan_id); formData.append("national_code", values.national_code); formData.append("shenasname_id", values.shenasname_id); if (values.shenasname_img != null) @@ -330,33 +327,6 @@ const AddFormComponent = () => { width: "100%", }} > - - - { {t("register_navy")} - - - + {/**/} + {/* */} + {/* {t("register_welfare_services")}*/} + {/* */} + {/**/} )} diff --git a/src/pages/dashboard/refahi/add-request-loan/index.jsx b/src/pages/dashboard/refahi/add-request-loan/index.jsx index df6c08b..b4575e9 100644 --- a/src/pages/dashboard/refahi/add-request-loan/index.jsx +++ b/src/pages/dashboard/refahi/add-request-loan/index.jsx @@ -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 ( - - - + {/**/} + {/* */} + {/**/} ); } diff --git a/src/pages/dashboard/refahi/edit-request-loan/[id].jsx b/src/pages/dashboard/refahi/edit-request-loan/[id].jsx index 4b2b477..f6b72d5 100644 --- a/src/pages/dashboard/refahi/edit-request-loan/[id].jsx +++ b/src/pages/dashboard/refahi/edit-request-loan/[id].jsx @@ -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 ( - - - + {/**/} + {/* */} + {/**/} ); } diff --git a/src/pages/dashboard/refahi/followUp-loan/index.jsx b/src/pages/dashboard/refahi/followUp-loan/index.jsx index 6f1d858..f679299 100644 --- a/src/pages/dashboard/refahi/followUp-loan/index.jsx +++ b/src/pages/dashboard/refahi/followUp-loan/index.jsx @@ -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 ( - - - + {/**/} + {/* */} + {/**/} ); } diff --git a/src/pages/register/welfare-services/index.jsx b/src/pages/register/welfare-services/index.jsx index b30bc4e..ce05a4f 100644 --- a/src/pages/register/welfare-services/index.jsx +++ b/src/pages/register/welfare-services/index.jsx @@ -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 ( - + {/**/} ); } From 66365f7267f8ce442052cd8be4db630463a0a52b Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Sun, 5 Nov 2023 16:07:08 +0330 Subject: [PATCH 2/4] LFFE-11 Remove navgan code from register and bring back navgan code in add loan request --- public/locales/fa/app.json | 2 +- .../navgan/add-request-loan/forms/AddForm.jsx | 48 +++++++++++++++---- src/components/register/navy/UserRegister.jsx | 22 --------- 3 files changed, 40 insertions(+), 32 deletions(-) diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 0c9d741..75aa877 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -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": "شماره شناسنامه خود را وارد کنید", diff --git a/src/components/dashboard/navgan/add-request-loan/forms/AddForm.jsx b/src/components/dashboard/navgan/add-request-loan/forms/AddForm.jsx index 6ce54e8..df79a4c 100644 --- a/src/components/dashboard/navgan/add-request-loan/forms/AddForm.jsx +++ b/src/components/dashboard/navgan/add-request-loan/forms/AddForm.jsx @@ -81,7 +81,8 @@ const AddFormComponent = () => { phone_number: "", vehicle_type: "", plate_number: "", - province: "", + province_id: "", + navgan_id: "", national_code: "", shenasname_id: "", national_card_img: null, @@ -101,7 +102,8 @@ const AddFormComponent = () => { plate_number: Yup.string().required( t("LoanRequest.error_message_plate_number") ), - province: Yup.string().required(t("LoanRequest.error_message_province")), + navgan_id: Yup.string().required(t("LoanRequest.error_message_navgan_id")), + province_id: Yup.string().required(t("LoanRequest.error_message_province_id")), national_code: Yup.string().required( t("LoanRequest.error_message_national_code") ), @@ -119,7 +121,8 @@ 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); if (values.shenasname_img != null) @@ -300,20 +303,20 @@ const AddFormComponent = () => { }} > @@ -327,6 +330,33 @@ const AddFormComponent = () => { width: "100%", }} > + + + { @@ -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 } /> -