update closingDateOff

src/pages/Proof/Payment/Pay_DN.js

@@ -67,7 +67,7 @@ const Index = ({ record }) => {
                                                 id: 'proofPaymentBody_demandNote2'
                                             },
                                             {
-                                                beforeClosingDate: "{beforeClosingDate}",
+                                                closingDateOff: "{closingDateOff}",
                                                 email: record?.mail,
                                             }
                                         )

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 }) => {
                                                                     <li><FormattedMessage id="post" /></li>
                                                                 </ul>
                                                             </td>
-                                                            <td style={tabelStyle}>{DateUtils.dateFormat(formData.beforeClosingDate, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m.</td>
+                                                            <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m.</td>
                                                             <td style={tabelStyle}>
                                                                 <FormattedMessage id="payDnRemark" values={{
                                                                     date: DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" })) + " 12:30 p.m."
@@ -408,7 +408,7 @@ const FormPanel = ({ formData }) => {
                                                                             <li><FormattedMessage id="post" /></li>
                                                                         </ul>
                                                                     </td>
-                                                                    <td style={tabelStyle}>{DateUtils.dateFormat(formData.beforeClosingDate, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m.</td>
+                                                                    <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m.</td>
                                                                     <td style={tabelStyle}>
                                                                         <FormattedMessage id="payDnRemark" values={{
                                                                             date: DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" })) + " 12:30 p.m."

src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js

@@ -48,7 +48,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections , gazetteIssueList}) =>
 
     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}) =>
                                             </tr>
                                             <tr>
                                                 <td style={tabelStyle}><FormattedMessage id="payDn" /></td>
-                                                <td style={tabelStyle}>{DateUtils.dateFormat(beforeClosingDate, dft)} 5:00 p.m.</td>
+                                                <td style={tabelStyle}>{DateUtils.dateFormat(closingDateOff, dft)} 5:00 p.m.</td>
                                                 <td style={tabelStyle}>{DateUtils.dateFormat(closeDate, dft)} 12:30 p.m.</td>
                                             </tr>
                                             <tr>

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}<br/><br/>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. : <br/>{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. : <br/>{email}",
   "proofPaymentBody_demandNote3": "Please make payment and return the payment proof (e.g. ATM receipt, internet banking record) to [email protected] by {paymentDeadline}.",
   "proofPaymentBody_demandNote4": "We will process the publication after receiving payment confirmation.",
 

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}<br/><br/>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. : <br/>{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. : <br/>{email}",
   "proofPaymentBody_demandNote3": "Please make payment and return the payment proof (e.g. ATM receipt, internet banking record) to [email protected] by {paymentDeadline}.",
   "proofPaymentBody_demandNote4": "We will process the publication after receiving payment confirmation.",
 

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}<br/><br/>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. : <br/>{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. : <br/>{email}",
   "proofPaymentBody_demandNote3": "Please make payment and return the payment proof (e.g. ATM receipt, internet banking record) to [email protected] by {paymentDeadline}.",
   "proofPaymentBody_demandNote4": "We will process the publication after receiving payment confirmation.",