alex
/
PNSPS-frontend-MaterialUI
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'master' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI

master
Jason Chuang 1 year ago
parent
0f36766ec0 961215fd58
commit
eb29f3fff5
3 changed files with 51 additions and 42 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -2
      src/pages/Organization/DetailPage/OrganizationCard.js
  2. +24
    -19
      src/pages/Payment/Details_GLD/PaymentDetails.js
  3. +26
    -21
      src/pages/Payment/Details_Public/PaymentDetails.js

+ 1
- 2
src/pages/Organization/DetailPage/OrganizationCard.js View File

@@ -552,10 +552,9 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
<Grid item> <Grid item>
<Typography variant="h6" style={{ padding: '16px' }}>Please Enter Organisation Short Name for Credit Client (Used for Demand Note)</Typography> <Typography variant="h6" style={{ padding: '16px' }}>Please Enter Organisation Short Name for Credit Client (Used for Demand Note)</Typography>
</Grid> </Grid>
<Grid item>
<Grid item sx={{padding: '16px'}}>
<TextField <TextField
fullWidth fullWidth
style={{ padding: '16px' }}
{...register("orgShortName")} {...register("orgShortName")}
id='orgShortName' id='orgShortName'
label="Organisation Short Name" label="Organisation Short Name"


+ 24
- 19
src/pages/Payment/Details_GLD/PaymentDetails.js View File

@@ -150,25 +150,30 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>
<Grid item xs={12} md={12}>
<Grid container alignItems="center">
<Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}>
<FormLabel sx={{ color: "#000000" }}>
Payment Receipt:
</FormLabel>
</Grid>
<Grid xs={6} md={5} sx={{ml:5,textAlign: "left" }}>
{onDownload?
<LoadingComponent disableText={true} alignItems="flex-start"/>
:
<Button className="printHidden" variant="contained" sx={{ mt:2 }} onClick={doPrint}>
<DownloadIcon/>
<Typography sx={{fontSize: "16px"}}>Download</Typography>
</Button>
}
</Grid>
</Grid>
</Grid>
{
data.status == "APPR"
?
<Grid item xs={12} md={12}>
<Grid container alignItems="center">
<Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}>
<FormLabel sx={{ color: "#000000" }}>
Payment Receipt:
</FormLabel>
</Grid>
<Grid xs={6} md={5} sx={{ml:5,textAlign: "left" }}>
{onDownload?
<LoadingComponent disableText={true} alignItems="flex-start"/>
:
<Button className="printHidden" variant="contained" sx={{ mt:2 }} onClick={doPrint}>
<DownloadIcon/>
<Typography sx={{fontSize: "16px"}}>Download</Typography>
</Button>
}
</Grid>
</Grid>
</Grid>
: null
}
</Grid> </Grid>
</form> </form>
</MainCard> </MainCard>


+ 26
- 21
src/pages/Payment/Details_Public/PaymentDetails.js View File

@@ -160,27 +160,32 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>
<Grid item xs={12} md={12}>
<Grid container spacing={5} alignItems="center">
<Grid item xs={6} md={6} sx={{textAlign: "right" }}>
<FormLabel sx={{ fontSize: "16px", color: "#000000" }}>
<FormattedMessage id="payReceipt"/>:
</FormLabel>
</Grid>
<Grid item xs={6} md={5} sx={{textAlign: "left" }}>
{onDownload?
<LoadingComponent disableText={true} alignItems="flex-start"/>
:
<Button className="printHidden" variant="contained" sx={{ mt:2 }} onClick={doPrint}>
<DownloadIcon/>
<Typography sx={{fontSize: "16px"}}>
<FormattedMessage id="download"/>
</Typography>
</Button>
}
</Grid>
</Grid>
</Grid>
{
data.status == "APPR"
?
<Grid item xs={12} md={12}>
<Grid container spacing={5} alignItems="center">
<Grid item xs={6} md={6} sx={{textAlign: "right" }}>
<FormLabel sx={{ fontSize: "16px", color: "#000000" }}>
<FormattedMessage id="payReceipt"/>:
</FormLabel>
</Grid>
<Grid item xs={6} md={5} sx={{textAlign: "left" }}>
{onDownload?
<LoadingComponent disableText={true} alignItems="flex-start"/>
:
<Button className="printHidden" variant="contained" sx={{ mt:2 }} onClick={doPrint}>
<DownloadIcon/>
<Typography sx={{fontSize: "16px"}}>
<FormattedMessage id="download"/>
</Typography>
</Button>
}
</Grid>
</Grid>
</Grid>
: null
}
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>


Write Preview
Loading…
Cancel
Save