Merge branch 'feature/yasi_check_state_id' into 'develop'

check state id conditions

See merge request witel-front-end/loan-facilities/user!51

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": "ویرایش درخواست وام"

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.latest_history.expert_description}`}
+                        </Typography>
+                    )}
                 </CardContent>
             </Card>
         </Grid>

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}/>
     );