diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
index bb832cc..c8874c8 100644
--- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
@@ -142,24 +142,24 @@ const ApplicationDetailCard = (
const latestData = {};
responseData.forEach(item => {
- const { appId, timeDiff } = item;
- if (latestData[appId] === undefined || timeDiff < latestData[appId].timeDiff) {
- latestData[appId] = item;
- }
+ const { appId, timeDiff } = item;
+ if (latestData[appId] === undefined || timeDiff < latestData[appId].timeDiff) {
+ latestData[appId] = item;
+ }
});
const latestDataObjects = Object.values(latestData);
-
+
const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
const filteredAppIds = filteredData.map(item => item.appId);
-
+
const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));
const combinedAppIdsArray = [...appIdsNotInData, ...filteredAppIds];
-
+
const readyToPayment = appIdList.every(appId => combinedAppIdsArray.includes(appId));
- if (readyToPayment){
+ if (readyToPayment) {
setIsPopUp(true);
return;
- }else{
+ } else {
const appIdsInData = appIdList.filter(appId => !combinedAppIdsArray.some(item => item === appId));
const HoldingApplication = latestDataObjects.filter(item => appIdsInData.includes(item.appId));
const resultString = HoldingApplication.map(item => item.appNo).join(' , ');
@@ -211,11 +211,11 @@ const ApplicationDetailCard = (
onClick={cancelledClick()}
color="edit"
disabled={currentApplicationDetailData.status == "rejected"
- || currentApplicationDetailData.status == "cancelled"
- || (!currentApplicationDetailData.creditor
- && currentApplicationDetailData.status == "paid")
- || (currentApplicationDetailData.creditor
- && currentApplicationDetailData.status == "confirmed")
+ || currentApplicationDetailData.status == "cancelled"
+ || (!currentApplicationDetailData.creditor
+ && currentApplicationDetailData.status == "paid")
+ || (currentApplicationDetailData.creditor
+ && currentApplicationDetailData.status == "confirmed")
}
title={intl.formatMessage({ id: 'cancel' })}
startIcon={}
@@ -505,12 +505,23 @@ const ApplicationDetailCard = (
- (HK$):
+ (HK$):
- {FormatUtils.currencyFormat(fee)}
+
+
+
@@ -618,7 +629,18 @@ const ApplicationDetailCard = (
:
- {currentApplicationDetailData.careOf}
+
+
+
: null
@@ -632,7 +654,18 @@ const ApplicationDetailCard = (
- {currentApplicationDetailData.remarks}
+
+
+