diff --git a/src/pages/Proof/Payment/Pay_DN.js b/src/pages/Proof/Payment/Pay_DN.js index f69f621..96bce0a 100644 --- a/src/pages/Proof/Payment/Pay_DN.js +++ b/src/pages/Proof/Payment/Pay_DN.js @@ -67,7 +67,7 @@ const Index = ({ record }) => { id: 'proofPaymentBody_demandNote2' }, { - beforeClosingDate: "{beforeClosingDate}", + closingDateOff: "{closingDateOff}", email: record?.mail, } ) diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js index 0134033..a6df980 100644 --- a/src/pages/Proof/Reply_Public/ProofForm.js +++ b/src/pages/Proof/Reply_Public/ProofForm.js @@ -171,7 +171,7 @@ const FormPanel = ({ formData }) => { } const isOverDnReviseDeadline = () => { - let reviseDeadline = DateUtils.convertToDate(formData.beforeClosingDate); + let reviseDeadline = DateUtils.convertToDate(formData.closingDateOff); reviseDeadline?.setTime(reviseDeadline?.getTime() + (17 * 60 * 60 * 1000));// 17:00 if (!reviseDeadline) return true; let current = new Date(); @@ -321,7 +321,7 @@ const FormPanel = ({ formData }) => {
    • - {DateUtils.dateFormat(formData.beforeClosingDate, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m. + {DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m. {
    • - {DateUtils.dateFormat(formData.beforeClosingDate, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m. + {DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m. const [issueId, setIssueId] = useState(loadedData.issueId); const [closeDate, setCloseDate] = useState(null); - const [beforeClosingDate, setBeforeClosingDate] = useState(null); + const [closingDateOff, setClosingDateOff] = useState(null); const navigate = useNavigate(); const BackgroundHead = { @@ -80,7 +80,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections , gazetteIssueList}) => let data = gazetteIssueList[i]; if(data.id == issueId){ setCloseDate(data.closingDate) - setBeforeClosingDate(data.beforeClosingDate) + setClosingDateOff(data.closingDateOff) break; } } @@ -332,7 +332,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections , gazetteIssueList}) => - {DateUtils.dateFormat(beforeClosingDate, dft)} 5:00 p.m. + {DateUtils.dateFormat(closingDateOff, dft)} 5:00 p.m. {DateUtils.dateFormat(closeDate, dft)} 12:30 p.m. diff --git a/src/translations/en.json b/src/translations/en.json index f4c6992..c239299 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -108,7 +108,7 @@ "proofPaymentHeader_demandNote": "Public Notice: Proofreading Completed and Payment Means Selected", "proofPaymentBody_demandNote": "We have received the manuscript proofreading confirmation and printing instructions for application number: {appNo}

    You have selected to make payment 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 {beforeClosingDate} 9:00 p.m. :
    {email}", + "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. :
    {email}", "proofPaymentBody_demandNote3": "Please make payment and return the payment proof (e.g. ATM receipt, internet banking record) to gld_acct@gld.gov.hk by {paymentDeadline}.", "proofPaymentBody_demandNote4": "We will process the publication after receiving payment confirmation.", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 333e30f..20200c5 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -133,7 +133,7 @@ "proofPaymentHeader_demandNote": "Public Notice: Proofreading Completed and Payment Means Selected", "proofPaymentBody_demandNote": "We have received the manuscript proofreading confirmation and printing instructions for application number: {appNo}

    You have selected to make payment 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 {beforeClosingDate} 9:00 p.m. :
    {email}", + "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. :
    {email}", "proofPaymentBody_demandNote3": "Please make payment and return the payment proof (e.g. ATM receipt, internet banking record) to gld_acct@gld.gov.hk by {paymentDeadline}.", "proofPaymentBody_demandNote4": "We will process the publication after receiving payment confirmation.", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index f813af3..837c7b5 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -133,7 +133,7 @@ "proofPaymentHeader_demandNote": "Public Notice: Proofreading Completed and Payment Means Selected", "proofPaymentBody_demandNote": "We have received the manuscript proofreading confirmation and printing instructions for application number: {appNo}

    You have selected to make payment 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 {beforeClosingDate} 9:00 p.m. :
    {email}", + "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. :
    {email}", "proofPaymentBody_demandNote3": "Please make payment and return the payment proof (e.g. ATM receipt, internet banking record) to gld_acct@gld.gov.hk by {paymentDeadline}.", "proofPaymentBody_demandNote4": "We will process the publication after receiving payment confirmation.",