update label

src/pages/Proof/Payment/Pay_DN.js

@@ -5,6 +5,9 @@ import {
     Stack,
     Button,
 } from '@mui/material';
+import { 
+    checkIsOnlyOnlinePayment,
+ } from "utils/Utils";
 import { useNavigate } from "react-router-dom";
 import * as DateUtils from "utils/DateUtils";
 
@@ -26,6 +29,7 @@ const BackgroundHead = {
 const Index = ({ record }) => {
     const navigate = useNavigate()
     const intl = useIntl();
+const isAfter = checkIsOnlyOnlinePayment();
 
     return (
         (
@@ -45,7 +49,9 @@ const Index = ({ record }) => {
                         <center>
                             <Grid item xs={12} md={8} >
                                 <Typography variant="h4" sx={{ textAlign: "left", ml: 4, mr: 4, mt: 4, borderBottom: "1px solid black" }}>
-                                    <FormattedMessage id="proofPaymentHeader_demandNote" />
+                                    <FormattedMessage
+                                            id={isAfter ? "proofPaymentHeader_demandNote2" : "proofPaymentHeader_demandNote"}
+                                    />
                                 </Typography>
 
 

src/pages/Proof/Payment/Pay_Office.js

@@ -5,6 +5,9 @@ import {
     Stack,
     Button,
 } from '@mui/material';
+import { 
+    checkIsOnlyOnlinePayment,
+ } from "utils/Utils";
 import { useNavigate } from "react-router-dom";
 import * as DateUtils from "utils/DateUtils";
 
@@ -26,6 +29,7 @@ const BackgroundHead = {
 const Index = ({ record }) => {
     const navigate = useNavigate()
     const intl = useIntl();
+const isAfter = checkIsOnlyOnlinePayment();
 
     return (
         (
@@ -45,7 +49,9 @@ const Index = ({ record }) => {
                         <center>
                             <Grid item xs={12} md={8} >
                                 <Typography variant="h4" sx={{ textAlign: "left", ml: 4, mr: 4, mt: 4, borderBottom: "1px solid black" }}>
-                                    <FormattedMessage id="proofPaymentHeader_office" />
+                                    <FormattedMessage
+                                            id={isAfter ? "proofPaymentHeader_office2" : "proofPaymentHeader_office"}
+                                    />
                                 </Typography>
 
 

src/pages/Proof/Payment/Pay_Online.js

@@ -14,6 +14,9 @@ import { useNavigate } from "react-router-dom";
 import * as DateUtils from "utils/DateUtils"
 import * as FormatUtils from "utils/FormatUtils";
 import { checkPaymentSuspention } from "utils/Utils";
+import { 
+    checkIsOnlyOnlinePayment,
+ } from "utils/Utils";
 
 import Loadable from 'components/Loadable';
 const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent')));
@@ -62,6 +65,8 @@ const Index = () => {
         setOnReady(true);
     }, [record]);
 
+    const isAfter = checkIsOnlyOnlinePayment();
+
 
     const loadForm = () => {
         if (params.id > 0) {
@@ -150,7 +155,9 @@ const Index = () => {
                             <center>
                                 <Grid item xs={12} md={8} >
                                     <Typography variant="h4" sx={{ textAlign: "left", ml: 4, mr: 4, mt: 4, borderBottom: "1px solid black" }}>
-                                        <FormattedMessage id="proofPaymentHeader_online" />
+                                        <FormattedMessage
+                                            id={isAfter ? "proofPaymentHeader_online2" : "proofPaymentHeader_online"}
+                                    />
                                     </Typography>
                                     <Typography variant="h5" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
                                         <div dangerouslySetInnerHTML={{

src/translations/en.json

@@ -119,13 +119,15 @@
   "publicNoticePaymentProofComment": "Public Notice: Proofreading Reply",
   "publicNoticePaymentProofInfo": "Public Notice: Proofreading",
 
-  "proofPaymentHeader_demandNote": "Public Notice: Proofreading Completed",
+  "proofPaymentHeader_demandNote": "Public Notice: Proofreading Completed and Payment Means Selected",	  
+  "proofPaymentHeader_demandNote2": "Public Notice: Proofreading Completed",
   "proofPaymentBody_demandNote": "We have received the manuscript proofreading confirmation and printing instructions for application number: {appNo}<br/><br/>You have selected to pay by General Demand Note.",
   "proofPaymentBody_demandNote2": "The General Demand Note will be sent to the following email address within one working day, but not later than {closingDateOff} 9:00 p.m. : <br/>{email}",
   "proofPaymentBody_demandNote3": "Please make payment and return the payment proof (e.g. ATM receipt, internet banking record) with the application number to [email protected] by {paymentDeadline} 12:30 p.m.",
   "proofPaymentBody_demandNote4": "We will process the publication after receiving the payment proof.",
 
-  "proofPaymentHeader_office": "Public Notice: Proofreading Completed",
+  "proofPaymentHeader_office": "Public Notice: Proofreading Completed and Payment Means Selected",	  
+  "proofPaymentHeader_office2": "Public Notice: Proofreading Completed",
   "proofPaymentBody_office": "We have received the manuscript proofreading confirmation and printing instructions for application number: {appNo}",
   "proofPaymentBody_office2": "You have selected to pay at North Point Government Offices Collection Office:<center><br/>Collection Office at Accounts Section, Government Logistics Department<br/>10/F North Point Government Offices<br/>333 Java Road, North Point, Hong Kong</center>",
   "proofPaymentBody_office3": "The office hours of the Collection Office is from 8:30 a.m. to 1 p.m., 2 p.m. to 5 p.m., Monday to Friday, except public holidays.",
@@ -133,7 +135,8 @@
   "proofPaymentBody_office5": "Please print out this page or present your application details on screen at our Collection Office, and complete the payment by {paymentDeadline} 12:30 p.m.",
   "proofPaymentBody_office6": "We will process the publication after receiving the payment.",
 
-  "proofPaymentHeader_online": "Public Notice: Proofreading Completed",
+  "proofPaymentHeader_online": "Public Notice: Proofreading Completed and Payment Means Selected",	  
+  "proofPaymentHeader_online2": "Public Notice: Proofreading Completed",
   "proofPaymentBody_online": "We have received the manuscript proofreading confirmation and printing instructions for application number: {appNo}",
   "proofPaymentBody_online2": "Please select either to complete the payment now or make payment by {paymentDeadline}",
   "proofPaymentBody_online3": "We will process the publication after receiving payment confirmation.",

src/translations/zh-CN.json

@@ -157,13 +157,15 @@
   "publicNoticePaymentProofComment": "公共启事：校对回复",
   "publicNoticePaymentProofInfo": "公共启事：校对",
 
-  "proofPaymentHeader_demandNote": "公共启事: 已完成校对",
+  "proofPaymentHeader_demandNote": "公共启事: 已完成校对并已选择付款方式",	
+  "proofPaymentHeader_demandNote2": "公共启事: 已完成校对",
   "proofPaymentBody_demandNote": "我们已收到以下申请编号的稿件校对确认及可付印指示:<br/>{appNo}<br/><br/>你已选择透过一般缴款单付款。",
   "proofPaymentBody_demandNote2": "一般缴款单将在一个工作天内，但不迟于{closingDateOff} 晚上9时前发送至以下电邮地址： <br/>{email}",
   "proofPaymentBody_demandNote3": "请在{paymentDeadline}下午12时30分前缴付款项并将相关付款证明（例如银行入数纸或网上银行付款记录）连同申请编号电邮至[email protected]。 ",
   "proofPaymentBody_demandNote4": "我们将在收到付款证明后处理刊登事宜。",
 
-  "proofPaymentHeader_office": "公共启事: 已完成校对",
+  "proofPaymentHeader_office": "公共启事: 已完成校对并已选择付款方式",	
+  "proofPaymentHeader_office2": "公共启事: 已完成校对",
   "proofPaymentBody_office": "我们已收到以下申请编号的稿件校对确认及可付印指示:<br/>{appNo}",
   "proofPaymentBody_office2": "你已选择到北角政府合署收款处付款：<center><br/>香港北角渣华道333号<br/>北角政府合署10楼<br/>政府物流服务署会计组收款处</center>",
   "proofPaymentBody_office3": "收款处的办公时间为星期一至五上午8时30分至下午1时及下午2时至5时，公众假期除外。",
@@ -171,7 +173,8 @@
   "proofPaymentBody_office5": "请列印此页面或出示电子设备屏幕上所显示的申请资料，以供收款处职员查阅，并在{paymentDeadline}下午12时30分前完成付款。",
   "proofPaymentBody_office6": "我们将在收到付款后处理刊登事宜。",
 
-  "proofPaymentHeader_online": "公共启事: 已完成校对",
+  "proofPaymentHeader_online": "公共启事: 已完成校对并已选择付款方式",	  
+  "proofPaymentHeader_online2": "公共启事: 已完成校对",
   "proofPaymentBody_online": "我们已收到以下申请编号的稿件校对确认及可付印指示:<br/>{appNo}",
   "proofPaymentBody_online2": "请选择即时完成付款，或在{paymentDeadline}下午2时30分前完成付款。",
   "proofPaymentBody_online3": "我们将在收到付款确认通知后处理刊登事宜。",

src/translations/zh-HK.json

@@ -157,13 +157,15 @@
   "publicNoticePaymentProofComment": "公共啟事：校對回覆",
   "publicNoticePaymentProofInfo": "公共啟事：校對",
 
-  "proofPaymentHeader_demandNote": "公共啟事: 已完成校對",
+  "proofPaymentHeader_demandNote": "公共啟事: 已完成校對並已選擇付款方式",	
+  "proofPaymentHeader_demandNote2": "公共啟事: 已完成校對",
   "proofPaymentBody_demandNote": "我們已收到以下申請編號的稿件校對確認及可付印指示:<br/>{appNo}<br/><br/>你已選擇透過一般繳款單付款。",
   "proofPaymentBody_demandNote2": "一般繳款單將在一個工作天內，但不遲於{closingDateOff} 晚上9時前發送至以下電郵地址： <br/>{email}",
   "proofPaymentBody_demandNote3": "請在{paymentDeadline}下午12時30分前繳付款項並將相關付款證明（例如銀行入數紙或網上銀行付款記錄）連同申請編號電郵至[email protected]。",
   "proofPaymentBody_demandNote4": "我們將在收到付款證明後處理刊登事宜。",
 
-  "proofPaymentHeader_office": "公共啟事: 已完成校對",
+  "proofPaymentHeader_office": "公共啟事: 已完成校對並已選擇付款方式",	
+  "proofPaymentHeader_office2": "公共啟事: 已完成校對",
   "proofPaymentBody_office": "我們已收到以下申請編號的稿件校對確認及可付印指示:<br/>{appNo}",
   "proofPaymentBody_office2": "你已選擇到北角政府合署收款處付款：<center><br/>香港北角渣華道333號<br/>北角政府合署10樓<br/>政府物流服務署會計组收款處</center>",
   "proofPaymentBody_office3": "收款處的辦公時間為星期一至五上午8時30分至下午1時及下午2時至5時，公眾假期除外。",
@@ -171,7 +173,8 @@
   "proofPaymentBody_office5": "請列印此頁面或出示電子設備屏幕上所顯示的申請資料，以供收款處職員查閱，並在{paymentDeadline}下午12時30分前完成付款。",
   "proofPaymentBody_office6": "我們將在收到付款後處理刊登事宜。",
 
-  "proofPaymentHeader_online": "公共啟事: 已完成校對",
+  "proofPaymentHeader_online": "公共啟事: 已完成校對並已選擇付款方式",	
+  "proofPaymentHeader_online2": "公共啟事: 已完成校對",
   "proofPaymentBody_online": "我們已收到以下申請編號的稿件校對確認及可付印指示:<br/>{appNo}",
   "proofPaymentBody_online2": "請選擇即時完成付款，或在{paymentDeadline}前完成付款。",
   "proofPaymentBody_online3": "我們將在收到付款確認通知後處理刊登事宜。",