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

src/pages/Organization/DetailPage/OrganizationCard.js

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

src/pages/Payment/Details_GLD/PaymentDetails.js

@@ -150,25 +150,30 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
                                 </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>
                 </form>
             </MainCard>

src/pages/Payment/Details_Public/PaymentDetails.js

@@ -160,27 +160,32 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
                                         </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>