From 7c8e8f44d691342b689a56827d045beeeccfbaf0 Mon Sep 17 00:00:00 2001
From: Yasiu1376 <yasaman1376529@gmail.com>
Date: Wed, 10 Jan 2024 13:46:05 +0330
Subject: [PATCH 1/2] pust state id conditions

---
 public/locales/fa/app.json                    |  6 +++--
 .../navgan/followUp-loan/RequestCard.jsx      | 23 +++++++++++++++----
 .../dashboard/navgan/show/form/index.jsx      |  7 ++++++
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json
index 261793b..0d2b5a5 100644
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -141,7 +141,8 @@
     "loan_date": "تاریخ درخواست",
     "loan_status": "وضعیت",
     "loan_bank_branch": "اطلاعات شعبه",
-    "loan_details": "نمایش"
+    "loan_details": "نمایش",
+    "loan_description": "توضیحات"
   },
   "LoanRequest": {
     "finish_loan_request": "درخواست شما با موفقیت ثبت شد",
@@ -285,7 +286,8 @@
     "error_message_occupation_id": "لطفا کد شغل (با توجه به مستندات ارائه شده) را به درستی وارد کنید!",
     "error_message_education_id": "لطفا تحصیلات (با توجه به مستندات ارائه شده) را به درستی وارد کنید!",
     "cityList_empty": "شهر یافت نشد",
-    "button_submit": "ویرایش"
+    "button_submit": "ویرایش",
+    "error_message_not_show_state": "شما دسترسی لازم به دریافت اطلاعات را ندارید!"
   },
   "EditLoanRequest": {
     "edit_loan_request_page": "ویرایش درخواست وام"
diff --git a/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx b/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx
index 54695db..0efd582 100644
--- a/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx
+++ b/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx
@@ -40,11 +40,24 @@ const RequestCard = ({item}) => {
                         {item.state_id === 8 && <CheckCircleIcon sx={{verticalAlign: 'middle', marginLeft: '4px', color: 'green'}}/>}
                         {item.state_id === 7 && <CancelIcon sx={{verticalAlign: 'middle', marginLeft: '4px', color: 'red'}}/>}
                     </Typography>
-                    <Button variant="contained" color="primary" sx={{alignSelf: 'flex-end'}}>
-                        <LinkRouting underline="none" color="inherit" href={`/dashboard/navgan/${item.id}/show`}>
-                            {t("LoanFollowUp.loan_details")}
-                        </LinkRouting>
-                    </Button>
+                    {item.state_id !== 7 && item.state_id !== 8 && (
+                        <Button variant="contained" color="primary" sx={{ alignSelf: 'flex-end' }}>
+                            <LinkRouting underline="none" color="inherit" href={`/dashboard/navgan/${item.id}/show`}>
+                                {t("LoanFollowUp.loan_details")}
+                            </LinkRouting>
+                        </Button>
+                    )}
+                    {item.state_id === 7 &&  (
+                        <Typography variant="body1" sx={{
+                            lineHeight: 2,
+                            paddingLeft: '20px',
+                            wordWrap: 'break-word',
+                            overflowWrap: 'break-word',
+                            wordBreak: 'break-word'
+                        }}>
+                            {`${t("LoanFollowUp.loan_description")}: ${item.expert_description}`}
+                        </Typography>
+                    )}
                 </CardContent>
             </Card>
         </Grid>
diff --git a/src/components/dashboard/navgan/show/form/index.jsx b/src/components/dashboard/navgan/show/form/index.jsx
index 7a6f74a..833a797 100644
--- a/src/components/dashboard/navgan/show/form/index.jsx
+++ b/src/components/dashboard/navgan/show/form/index.jsx
@@ -27,6 +27,13 @@ const ShowLoanForm = () => {
             </Stack>
         );
     }
+    else if(LoanDetails.state_id===8 || LoanDetails.state_id===7) {
+        return (
+            <Stack sx={{alignItems: "center", justifyContent: "center"}} spacing={3}>
+                <Typography>{t("ShowLoan.error_message_not_show_state")}</Typography>
+            </Stack>
+        );
+    }
     return (
         <UpdateForm LoanDetails={LoanDetails} LoanId={query.id}/>
     );

From d1949152cae24eceac394c27ddea077a23284d94 Mon Sep 17 00:00:00 2001
From: Yasiu1376 <yasaman1376529@gmail.com>
Date: Sun, 14 Jan 2024 10:27:54 +0330
Subject: [PATCH 2/2] merging dashboard

---
 src/components/dashboard/navgan/followUp-loan/RequestCard.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx b/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx
index 0efd582..30e19e5 100644
--- a/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx
+++ b/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx
@@ -55,7 +55,7 @@ const RequestCard = ({item}) => {
                             overflowWrap: 'break-word',
                             wordBreak: 'break-word'
                         }}>
-                            {`${t("LoanFollowUp.loan_description")}: ${item.expert_description}`}
+                            {`${t("LoanFollowUp.loan_description")}: ${item.latest_history.expert_description}`}
                         </Typography>
                     )}
                 </CardContent>