update proof deadline, payment deadline

src/pages/Proof/Reply_Public/ApplicationDetails.js

@@ -231,16 +231,16 @@ const ApplicationDetailCard = ({ formData, }) => {
                                     <Grid item xs={12} md={12} lg={12}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
                                         <Typography variant="h5" display="inline">
-                                    
+
                                             <FormattedMessage id="commentDeadline" />：
                                         </Typography>
                                     </Grid>
                                     <Grid item xs={12} md={12} lg={12} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}>
                                         <Typography variant="h5">&emsp;
                                             {locale === 'en' ?
-                                                `${intl.formatMessage({ id: 'before' })} ${DateUtils.datetimeStr(data?.reviseDeadline)} `
+                                                `${intl.formatMessage({ id: 'before' })} ${DateUtils.dateFormat(data?.reviseDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} `
                                                 :
-                                                `${DateUtils.datetimeStr_Cht(data?.reviseDeadline)} ${intl.formatMessage({ id: 'before' })}`
+                                                `${DateUtils.dateFormat(data?.reviseDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} ${intl.formatMessage({ id: 'before' })}`
                                             }
                                         </Typography>
                                     </Grid>
@@ -254,9 +254,9 @@ const ApplicationDetailCard = ({ formData, }) => {
                                     <Grid item xs={12} md={12} lg={12} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}>
                                         <Typography variant="h5">&emsp;
                                             {locale === 'en' ?
-                                                `${intl.formatMessage({ id: 'before' })} ${DateUtils.datetimeStr(data?.proofPaymentDeadline)} `
+                                                `${intl.formatMessage({ id: 'before' })}  ${DateUtils.dateFormat(data?.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} `
                                                 :
-                                                `${DateUtils.datetimeStr_Cht(data?.proofPaymentDeadline)} ${intl.formatMessage({ id: 'before' })}`
+                                                `${DateUtils.dateFormat(data?.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")}  ${intl.formatMessage({ id: 'before' })}`
                                             }
                                         </Typography>
                                     </Grid>

src/pages/Proof/Reply_Public/ProofForm.js

@@ -424,8 +424,8 @@ const FormPanel = ({ formData }) => {
                                                                     setIsWarningPopUp(true);
                                                                 }}><FormattedMessage id="viewDetail" /></a>
                                                             </td>
-                                                            <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} 2:00 p.m.</td>
-                                                            <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} 2:30 p.m.</td>
+                                                            <td style={tabelStyle}>{DateUtils.dateFormat(formData.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")}</td>
+                                                            <td style={tabelStyle}>{DateUtils.dateFormat(formData.expiryDate, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")}</td>
                                                         </tr>
                                                         <tr>
                                                             <td style={tabelStyle}>

src/translations/en.json

@@ -6,6 +6,7 @@
   "iamsmartLink": "https://www.iamsmart.gov.hk/en/",
   "dateStrFormat": "YYYY-MM-DD",
   "datetimeStrFormat": "YYYY-MM-DD HH:mm:ss",
+  "paymentMethodDatetimeStrFormat": "YYYY-MM-DD h:mm a",
   
   "PNSPS": "PNSPS",
   "HKSARGOV": "HKSAR Government",

src/translations/zh-CN.json

@@ -6,6 +6,7 @@
   "iamsmartLink": "https://www.iamsmart.gov.hk/sc/",
   "dateStrFormat": "YYYY年MM月DD日",
   "datetimeStrFormat": "YYYY年MM月DD日 HH:mm:ss",
+  "paymentMethodDatetimeStrFormat": "YYYY年MM月DD日 h:mm a",
 
   "PNSPS": "公共启事提交及缴费系统",
   "HKSARGOV": "香港特别行政区政府",

src/translations/zh-HK.json

@@ -6,6 +6,7 @@
   "iamsmartLink": "https://www.iamsmart.gov.hk/tc/",
   "dateStrFormat": "YYYY年MM月DD日",
   "datetimeStrFormat": "YYYY年MM月DD日 HH:mm:ss",
+  "paymentMethodDatetimeStrFormat": "YYYY年MM月DD日 h:mm a",
 
   "PNSPS": "公共啟事提交及繳費系統",
   "HKSARGOV": "香港特別行政區政府",