change 20min block to 30min

src/pages/DemandNote/Export/SearchForm.js

@@ -107,6 +107,7 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData }) => {
             },
             onResponse: () => {
                 setTimeout(()=> setWaitDownload(false), 500)
+                // location.reload();
             }
         });
     }

src/pages/Payment/MultiPaymentWindow.js

@@ -216,7 +216,7 @@ const MultiPaymentWindow = (props) => {
             });
             const latestDataObjects = Object.values(latestData);
             
-            const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
+            const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status !== "APPR");
             const filteredAppIds = filteredData.map(item => item.appId);
             
             const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));
@@ -277,7 +277,7 @@ const MultiPaymentWindow = (props) => {
       <DialogTitle >
         <Grid container>
           <Grid item>
-            <Stack direction="row" justifyContent="flex-start" alignItems="center">
+            <Stack direction="column" justifyContent="flex-start" alignItems="center">
               <Typography variant="h4">
                 {windowTitle}              
               </Typography>
@@ -289,6 +289,9 @@ const MultiPaymentWindow = (props) => {
         <form>
           <DialogContent>
             <DialogContentText>
+              <FormLabel sx={{ fontSize: "20px", color: "#000000", textAlign: "left", ml:1}}>
+                <FormattedMessage id="paymentProcessLimited"/>。
+              </FormLabel>
               <Grid item xs={12} md={12} sx={{ pt: 2 }} style={{ height: '100%' }} width="100%">
                 <Box xs={12} md={12} sx={{ p: 4, border: '3px solid #eee', borderRadius: '10px' }} >
                   <Grid container justifyContent="flex-start" alignItems="left" >

src/pages/Proof/Payment/Pay.js

@@ -62,7 +62,7 @@ const Index = ({ record }) => {
                 });
                 const latestDataObjects = Object.values(latestData);
 
-                const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
+                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status !== "APPR");
                 const filteredAppIds = filteredData.map(item => item.appId);
 
                 const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));

src/pages/Proof/Payment/Pay_Online.js

@@ -100,7 +100,7 @@ const Index = () => {
                 });
                 const latestDataObjects = Object.values(latestData);
 
-                const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
+                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status !== "APPR");
                 const filteredAppIds = filteredData.map(item => item.appId);
 
                 const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));

src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js

@@ -142,7 +142,7 @@ const ApplicationDetailCard = (
                 });
                 const latestDataObjects = Object.values(latestData);
 
-                const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
+                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status !== "APPR");
                 const filteredAppIds = filteredData.map(item => item.appId);
 
                 const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));

src/pages/PublicNotice/ListPanel/PendingPaymentTab.js

@@ -143,7 +143,7 @@ export default function SubmittedTab({ setCount, url }) {
                 });
                 const latestDataObjects = Object.values(latestData);
 
-                const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
+                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status !== "APPR");
                 const filteredAppIds = filteredData.map(item => item.appId);
 
                 const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));

src/translations/en.json

@@ -77,7 +77,7 @@
   "MSG.plzSelectPaymentMethod": "Please select payment means",
   "MSG.plzSelectApp": "Please select application",
   "MSG.actionFail": "Action failed",
-  "MSG.paymentHolded": "Application number {appNo} is currently in the process of payment. If the payment is unsuccessful, please try again after 20 minutes. We apologise for any inconvenience caused.",
+  "MSG.paymentHolded": "Application number {appNo} is currently in the process of payment. If the payment is unsuccessful, please try again after 30 minutes. We apologise for any inconvenience caused.",
   "MSG.pay_credity1": "We have received your confirmed application for proofreading and printing instructions regarding application number {appNo}. We will arrange for its publication with in the Year {year},  Volume {issueVolume}, Issue {issueNo} of the Official Gazette.",
   "MSG.pay_credity2": "The fee for this public notice will be consolidated in the next Payment Notice. Please ensure timely payment.",
   "MSG.plzonlinePayment": "Please select the payment means with online payment for the application.",
@@ -384,6 +384,7 @@
   "paymentLimitPrice2":" is only applicable when minimum amount is 0.10 and maximum amount is 9,999,999.99",
   "paymentLimitPPS":" is not available via mobile device browsers, please access the service via desktop computers.",
   "paymentMethod": "Payment Method",
+  "paymentProcessLimited":"Payment process must be completed within 30 minutes and return to this system",
   
   "publicNoticeDetailTitle": "Public Notice Application Information",
   "applyPerson": "Applicant",

src/translations/zh-CN.json

@@ -63,6 +63,7 @@
   "payNPGOMethod":"收款办公室付款",
   "payOnlineBtn":"网上付款",
   "paymentMethod":"付款方式",
+  "paymentProcessLimited":"付款过程必须在 30 分钟内完成及返回本系统",
 
   "payDnRemark": "在{date}之前将付款证明（如自动柜员机收据、网路银行记录）寄至 [email protected] ",
   "payNPGORemark" :"在{date}之前在收款办公室完成付款",
@@ -105,7 +106,7 @@
   "MSG.plzSelectPaymentMethod": "请选择付款方式",
   "MSG.plzSelectApp": "请选择公共启事。",
   "MSG.actionFail": "行动失败",
-  "MSG.paymentHolded": "申请编号 {appNo} 已正在付款的流程中，如相关付款没有成功，请于20分钟后再尝试付款，不便之处，请见谅！",
+  "MSG.paymentHolded": "申请编号 {appNo} 已正在付款的流程中，如相关付款没有成功，请于30分钟后再尝试付款，不便之处，请见谅！",
   "MSG.pay_credity1": "我们已收到你已确定申请编号: {appNo} 的稿件校对确定及可付印的指示，并将安排刊登于宪报期数{year} 年{issueVolume} 卷第{issueNo } 期内。",
   "MSG.pay_credity2": "此公共启事申请的费用将于下期发出的缴费发票时收取，请依时缴费。",
   "MSG.plzonlinePayment": "只能选择付款方式是网上支付的申请。",

src/translations/zh-HK.json

@@ -104,7 +104,7 @@
   "MSG.plzSelectApp": "請選擇公共啟事。",
   "MSG.plzSelectPaymentMethod": "請選擇付款方式",
   "MSG.actionFail": "行動失敗",
-  "MSG.paymentHolded": "申請編號 {appNo} 已正在付款的流程中，如相關付款沒有成功，請於20分鐘後再嘗試付款，不便之處，請見諒！",
+  "MSG.paymentHolded": "申請編號 {appNo} 已正在付款的流程中，如相關付款沒有成功，請於30分鐘後再嘗試付款，不便之處，請見諒！",
   "MSG.pay_credity1": "我們已收到你已確定申請編號: {appNo} 的稿件校對確定及可付印的指示，並將安排刊登於憲報 期數 {year} 年 {issueVolume} 卷 第 {issueNo} 期內。",
   "MSG.pay_credity2": "此公共啟事申請的費用將於下期發出的繳費發票時收取，請依時繳費。",
   "MSG.plzonlinePayment": "只能選擇付款方式是網上支付的申請。",
@@ -408,6 +408,7 @@
   "paymentLimitPrice2":"只適用於最小金額為 0.10 及最高金額為 9,999,999.99",
   "paymentLimitPPS":"付款不適用於流動裝置的瀏覽器，請使用桌面電腦。",
   "paymentMethod": "付款方法",
+  "paymentProcessLimited":"付款程序必須在 30 分鐘內完成及返回本系统",
 
   "publicNoticeDetailTitle": "公共啟事申請資料",
   "applyPerson": "申請人",