diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
index db8c422..5194c4d 100644
--- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
+++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
@@ -352,7 +352,11 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
}}>
{DateUtils.dateFormat(closeDate, dft)} 2:00 p.m. |
- {DateUtils.dateFormat(closeDate, dft)} 2:30 p.m. |
+
+
+ |
@@ -371,13 +375,20 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
+
+
+
>
);
setIsWarningPopUp(true);
}}>
|
{DateUtils.dateFormat(closingDateOff, dft)} 5:00 p.m. |
- {DateUtils.dateFormat(closeDate, dft)} 12:00 p.m. |
+
+
+ |
@@ -395,7 +406,11 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
}}>
|
{DateUtils.dateFormat(closeDate, dft)} 12:00 p.m. |
- {DateUtils.dateFormat(closeDate, dft)} 12:30 p.m. |
+
+
+ |
diff --git a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
index 18b7bf4..feb3037 100644
--- a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
@@ -46,6 +46,7 @@ const ApplicationDetailCard = (
const [orgDetail, setOrgDetail] = useState({});
const [verified, setVerified] = useState(null);
const [fileDetail, setfileDetail] = useState({});
+ const [proofId, setProofId] = useState(null);
const [onReady, setOnReady] = useState(false);
const { register, handleSubmit } = useForm()
@@ -77,6 +78,7 @@ const ApplicationDetailCard = (
setCompanyName(applicationDetailData.companyName);
setVerified(applicationDetailData.userData.verifiedBy ? true : false)
setfileDetail(applicationDetailData.fileDetail);
+ setProofId(applicationDetailData.proofId);
// setReload(false)
}
@@ -255,18 +257,23 @@ const ApplicationDetailCard = (
Re-Submit
-
+ {
+ proofId == null || proofId == 0?
+
+ :
+ null
+ }
> :
(currentApplicationDetailData.status == "confirmed" && currentApplicationDetailData.creditor == 1) ?
<>
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index d814b82..be89c55 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -41,7 +41,7 @@
"confirmingDealine": "确认校对的截止日期",
"PaymentCoonpletDealine": "付款截止日期",
- "payOnline":"透过此系统网上支付",
+ "payOnline":"透过此系统网上付款",
"payDn":"透过发出一般缴款单付款",
"payNPGO":"在北角政府合署收款处付款",
"paymentMeans":"付款方式",
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index cfba499..47c1539 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -41,7 +41,7 @@
"confirmingDealine": "確認校對的截止日期",
"PaymentCoonpletDealine": "付款截止日期",
- "payOnline":"透過此系統網上支付",
+ "payOnline":"透過此系統網上付款",
"payDn":"透過發出一般繳款單付款",
"payNPGO":"在北角政府合署收款處付款",
"paymentMeans":"付款方式",