From 34609c5d122762f7da65353d8ef2e99cbf4e0c76 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sat, 16 Nov 2024 10:48:43 +0330 Subject: [PATCH 1/4] loan description state id 7 --- public/locales/fa/app.json | 1 + .../dashboard/navgan/followUp-loan/RequestCard.jsx | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index b3808f2..66e6b2b 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -151,6 +151,7 @@ "loan_bank_branch": "اطلاعات شعبه", "loan_details": "نمایش", "loan_edit": "ویرایش", + "loan_no_expert_description": "اطلاعاتی موجود نیست", "loan_cancel": "رد درخواست", "loan_review": "درحال بررسی", "loan_reserve": "در صف انتظار", diff --git a/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx b/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx index 7d0d4f3..10bee5f 100644 --- a/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx +++ b/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx @@ -87,7 +87,10 @@ const RequestCard = ({ item }) => { wordBreak: "break-word", }} > - {`${t("LoanFollowUp.loan_description")}: ${item.latestHistory.expert_description}`} + {`${t("LoanFollowUp.loan_description")}: ${item.latestHistory?.expert_description + ? item.latestHistory.expert_description + : t("LoanFollowUp.loan_no_expert_description") + }`} )} {item.state_id === 7 && ( @@ -101,7 +104,10 @@ const RequestCard = ({ item }) => { wordBreak: "break-word", }} > - {`${t("LoanFollowUp.loan_description")}: درخواست وام توسط بانک تایید نشد (نیاز به اصلاح اطلاعات) `} + {`${t("LoanFollowUp.loan_description")}: ${item.latestHistory?.expert_description + ? item.latestHistory.expert_description + : t("LoanFollowUp.loan_no_expert_description") + }`} )} From dabd0345a6ac01aced612efcf3b331879fc47ffd Mon Sep 17 00:00:00 2001 From: Amirhossein Mahmoodi Date: Sat, 16 Nov 2024 11:05:39 +0330 Subject: [PATCH 2/4] delete log --- .../navgan/show/form/UpdateFormReal.jsx | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/components/dashboard/navgan/show/form/UpdateFormReal.jsx b/src/components/dashboard/navgan/show/form/UpdateFormReal.jsx index a759992..6b99140 100644 --- a/src/components/dashboard/navgan/show/form/UpdateFormReal.jsx +++ b/src/components/dashboard/navgan/show/form/UpdateFormReal.jsx @@ -110,12 +110,12 @@ const UpdateFormReal = ({ LoanDetails, LoanId }) => { ([national_serial_number_or_tracking_code], schema) => { return national_serial_number_or_tracking_code === "serial_number" ? schema - .test( - "max", - `${t("LoanRequest.national_serial_number_max")}`, - (value) => value && value.toString().length === 10 - ) - .required(t("ShowLoan.error_message_shenasname_serial")) + .test( + "max", + `${t("LoanRequest.national_serial_number_max")}`, + (value) => value && value.toString().length === 10 + ) + .required(t("ShowLoan.error_message_shenasname_serial")) : schema; } ), @@ -124,12 +124,12 @@ const UpdateFormReal = ({ LoanDetails, LoanId }) => { ([national_serial_number_or_tracking_code], schema) => { return national_serial_number_or_tracking_code === "tracking_code" ? schema - .test( - "max", - `${t("LoanRequest.national_tracking_code_max")}`, - (value) => value && value.toString().length === 10 - ) - .required(t("ShowLoan.error_message_tracking_code")) + .test( + "max", + `${t("LoanRequest.national_tracking_code_max")}`, + (value) => value && value.toString().length === 10 + ) + .required(t("ShowLoan.error_message_tracking_code")) : schema; } ), @@ -170,7 +170,7 @@ const UpdateFormReal = ({ LoanDetails, LoanId }) => { .then(() => { router.push("/dashboard/navgan/followUp-loan"); }) - .catch(() => {}) + .catch(() => { }) .finally(() => { props.setSubmitting(false); }); @@ -191,7 +191,7 @@ const UpdateFormReal = ({ LoanDetails, LoanId }) => { formik.setFieldValue("requested_facilities", formik.values.requested_facilities); } }; - console.log(formik.values.requested_facilities); + return ( <> @@ -492,15 +492,15 @@ const UpdateFormReal = ({ LoanDetails, LoanId }) => { }); value === "serial_number" ? formik.setFieldValue( - "national_tracking_code", - formik.initialValues.national_tracking_code, - false - ) + "national_tracking_code", + formik.initialValues.national_tracking_code, + false + ) : formik.setFieldValue( - "national_serial_number", - formik.initialValues.national_serial_number, - false - ); + "national_serial_number", + formik.initialValues.national_serial_number, + false + ); }} > From d0245c7a372505adb80eb69b716473993a318ddb Mon Sep 17 00:00:00 2001 From: Amirhossein Mahmoodi Date: Sat, 16 Nov 2024 11:07:28 +0330 Subject: [PATCH 3/4] formatting --- .../navgan/followUp-loan/RequestCard.jsx | 14 ++++--- .../navgan/show/form/UpdateFormReal.jsx | 42 +++++++++---------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx b/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx index 10bee5f..62ab5c7 100644 --- a/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx +++ b/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx @@ -87,9 +87,10 @@ const RequestCard = ({ item }) => { wordBreak: "break-word", }} > - {`${t("LoanFollowUp.loan_description")}: ${item.latestHistory?.expert_description - ? item.latestHistory.expert_description - : t("LoanFollowUp.loan_no_expert_description") + {`${t("LoanFollowUp.loan_description")}: ${ + item.latestHistory?.expert_description + ? item.latestHistory.expert_description + : t("LoanFollowUp.loan_no_expert_description") }`} )} @@ -104,9 +105,10 @@ const RequestCard = ({ item }) => { wordBreak: "break-word", }} > - {`${t("LoanFollowUp.loan_description")}: ${item.latestHistory?.expert_description - ? item.latestHistory.expert_description - : t("LoanFollowUp.loan_no_expert_description") + {`${t("LoanFollowUp.loan_description")}: ${ + item.latestHistory?.expert_description + ? item.latestHistory.expert_description + : t("LoanFollowUp.loan_no_expert_description") }`} )} diff --git a/src/components/dashboard/navgan/show/form/UpdateFormReal.jsx b/src/components/dashboard/navgan/show/form/UpdateFormReal.jsx index 6b99140..037d7ff 100644 --- a/src/components/dashboard/navgan/show/form/UpdateFormReal.jsx +++ b/src/components/dashboard/navgan/show/form/UpdateFormReal.jsx @@ -110,12 +110,12 @@ const UpdateFormReal = ({ LoanDetails, LoanId }) => { ([national_serial_number_or_tracking_code], schema) => { return national_serial_number_or_tracking_code === "serial_number" ? schema - .test( - "max", - `${t("LoanRequest.national_serial_number_max")}`, - (value) => value && value.toString().length === 10 - ) - .required(t("ShowLoan.error_message_shenasname_serial")) + .test( + "max", + `${t("LoanRequest.national_serial_number_max")}`, + (value) => value && value.toString().length === 10 + ) + .required(t("ShowLoan.error_message_shenasname_serial")) : schema; } ), @@ -124,12 +124,12 @@ const UpdateFormReal = ({ LoanDetails, LoanId }) => { ([national_serial_number_or_tracking_code], schema) => { return national_serial_number_or_tracking_code === "tracking_code" ? schema - .test( - "max", - `${t("LoanRequest.national_tracking_code_max")}`, - (value) => value && value.toString().length === 10 - ) - .required(t("ShowLoan.error_message_tracking_code")) + .test( + "max", + `${t("LoanRequest.national_tracking_code_max")}`, + (value) => value && value.toString().length === 10 + ) + .required(t("ShowLoan.error_message_tracking_code")) : schema; } ), @@ -170,7 +170,7 @@ const UpdateFormReal = ({ LoanDetails, LoanId }) => { .then(() => { router.push("/dashboard/navgan/followUp-loan"); }) - .catch(() => { }) + .catch(() => {}) .finally(() => { props.setSubmitting(false); }); @@ -492,15 +492,15 @@ const UpdateFormReal = ({ LoanDetails, LoanId }) => { }); value === "serial_number" ? formik.setFieldValue( - "national_tracking_code", - formik.initialValues.national_tracking_code, - false - ) + "national_tracking_code", + formik.initialValues.national_tracking_code, + false + ) : formik.setFieldValue( - "national_serial_number", - formik.initialValues.national_serial_number, - false - ); + "national_serial_number", + formik.initialValues.national_serial_number, + false + ); }} > From 38e085e2a2d2ba4ce78b8bd91fc364018fb01d45 Mon Sep 17 00:00:00 2001 From: Amirhossein Mahmoodi Date: Sat, 16 Nov 2024 11:08:25 +0330 Subject: [PATCH 4/4] change version --- .env.local.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.local.example b/.env.local.example index 9285573..9bd990f 100644 --- a/.env.local.example +++ b/.env.local.example @@ -1,5 +1,5 @@ NEXT_PUBLIC_API_NAME = "Loan Facilities Dashboard" -NEXT_PUBLIC_API_VERSION = "2.3.3" +NEXT_PUBLIC_API_VERSION = "2.3.4" NEXT_PUBLIC_DEFAULT_LANGUAGE = "fa" NEXT_PUBLIC_DEFAULT_DIRECTION = "rtl"