From 700b6fed41db7a67d567b56b9434621e90e9cd7c Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Fri, 17 May 2024 14:23:12 +0800
Subject: [PATCH] fix online revoke payment

---
 .../PublicNotice/Details_GLD/ApplicationDetailCard.js      | 2 ++
 src/pages/PublicNotice/ListPanel/PendingPaymentTab.js      | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
index 35f3083..84b880f 100644
--- a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
@@ -272,11 +272,13 @@ const ApplicationDetailCard = (
                                                             // size="large"
                                                             variant="contained"
                                                             onClick={revokeClick()}
+                                                            disabled={currentApplicationDetailData.paymentMethod=="online"||currentApplicationDetailData.paymentMethod==null}
                                                             sx={{
                                                                 textTransform: 'capitalize',
                                                                 alignItems: 'end',
                                                                 backgroundColor: '#ffa733'
                                                             }}>
+                                                            
                                                             <ReplayIcon />
                                                             <Typography ml={1} variant="h5">Revoke Payment</Typography>
                                                         </Button>
diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
index 3d7fce2..da41e56 100644
--- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
+++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
@@ -219,7 +219,12 @@ export default function SubmittedTab({ setCount, url }) {
             renderCell: (params) => (
                 <div>
                     <FormattedMessage id={utils.getPaymentMethod(params.row.paymentMethod)} /><br />
-                    <div>{dateStr(params.row.closingDateOff)}</div>
+                    <div>
+                        {dateStr(params.row.closingDateOff)}
+                        {params.row.paymentMethod=="online" ? " 2pm"
+                            :params.row.paymentMethod=="demandNote" ? " 12:00pm"
+                                : " 12:30pm"}
+                    </div>
                 </div>
             )
         },