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

Merge branch 'release/v1.29.1'

Browse Source
This commit is contained in:
AmirHossein Mahmoodi
2024-02-07 17:19:14 +03:30
parent 7629e9938b 7742248cb4
commit 3d7ea7e4e9
4 changed files with 567 additions and 663 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.29.0"
NEXT_PUBLIC_API_VERSION = "1.29.1"
NEXT_PUBLIC_DEFAULT_LANGUAGE = "fa"
NEXT_PUBLIC_DEFAULT_DIRECTION = "rtl"

40
src/components/dashboard/navgan/followUp-loan/RequestCard.jsx
View File

@@ -14,7 +14,12 @@ const RequestCard = ({item}) => {
width: "100%",
boxShadow: "rgba(0, 0, 0, 0.15) 0px 5px 15px 0px"
}}>
<CardContent sx={{display: 'flex', flexDirection: 'column', alignItems: 'flex-start' , paddingBottom: '16px !important'}}>
<CardContent sx={{
display: 'flex',
flexDirection: 'column',
alignItems: 'flex-start',
paddingBottom: '16px !important'
}}>
<Box
sx={{
borderLeft: '6px solid',
@@ -23,31 +28,27 @@ const RequestCard = ({item}) => {
paddingLeft: '10px',
}}
>
<Typography variant="h6" sx={{lineHeight: 2 , fontWeight:'bold'}}>
<Typography variant="h6" sx={{lineHeight: 2, fontWeight: 'bold'}}>
{`${t("LoanFollowUp.loan_unique_code")}: ${item.id}`}
</Typography>
</Box>
<Typography variant="body1" sx={{lineHeight: 2 , paddingLeft: '20px'}}>
<Typography variant="body1" sx={{lineHeight: 2, paddingLeft: '20px'}}>
{`${t("LoanFollowUp.loan_date")}: ${moment(item.created_at).locale("fa").format("HH:mm | YYYY/MM/DD")}`}
</Typography>
<Typography variant="body1" sx={{lineHeight: 2 , paddingLeft: '20px'}}>
<Typography variant="body1" sx={{lineHeight: 2, paddingLeft: '20px'}}>
{`${t("LoanFollowUp.loan_bank_branch")}: ${item.branch_info === null ? '-' : item.branch_info}`}
</Typography>
<Typography variant="body1" sx={{lineHeight: 2 , paddingLeft: '20px'}}>
<Typography variant="body1" sx={{lineHeight: 2, paddingLeft: '20px'}}>
{`${t("LoanFollowUp.loan_status")}: `}
{item.loan_state}
{item.state_id >= 1 && item.state_id <= 6 && <AccessTimeFilledIcon sx={{verticalAlign: 'middle', marginLeft: '4px' , color: '#48a4df'}}/>}
{item.state_id === 8 && <CheckCircleIcon sx={{verticalAlign: 'middle', marginLeft: '4px', color: 'green'}}/>}
{item.state_id === 7 && <CancelIcon sx={{verticalAlign: 'middle', marginLeft: '4px', color: 'red'}}/>}
{item.state_id >= 1 && item.state_id <= 6 &&
<AccessTimeFilledIcon sx={{verticalAlign: 'middle', marginLeft: '4px', color: '#48a4df'}}/>}
{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>
{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 && (
{item.state_id === 7 && (
<Typography variant="body1" sx={{
lineHeight: 2,
paddingLeft: '20px',
@@ -58,6 +59,13 @@ const RequestCard = ({item}) => {
{`${t("LoanFollowUp.loan_description")}: ${item.latest_history.expert_description}`}
</Typography>
)}
{item.state_id === 8 && item.bank_status === 0 && (
<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>
)}
</CardContent>
</Card>
</Grid>

1185
src/components/dashboard/navgan/show/form/UpdateForm.jsx
View File

File diff suppressed because it is too large Load Diff

3
src/components/dashboard/navgan/show/form/index.jsx
View File

@@ -26,8 +26,7 @@ const ShowLoanForm = () => {
<Typography>{t("ShowLoan.loading_show_component")}</Typography>
</Stack>
);
}
else if(LoanDetails.state_id===8 || LoanDetails.state_id===7) {
} else if (!(LoanDetails.state_id === 8 && LoanDetails.bank_status === 0)) {
return (
<Stack sx={{alignItems: "center", justifyContent: "center"}} spacing={3}>
<Typography>{t("ShowLoan.error_message_not_show_state")}</Typography>