Merge branch 'master' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI

src/pages/DemandNote/Search/DataGrid.js

@@ -440,7 +440,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
                     }}
                 >
                     <DialogContent style={{ display: 'flex', }}>
-                        <Typography variant="h4" style={{ padding: '16px' }}>Calculating, please wait ...</Typography>
+                        <Typography variant="h4" style={{ padding: '16px' }}>Please wait ...</Typography>
                     </DialogContent>
                 </Dialog>
             </div>

src/pages/Proof/Reply_Public/ProofForm.js

@@ -67,7 +67,7 @@ const FormPanel = ({ formData }) => {
             }
 
             if (isOverTime()) {
-                setWarningText("回覆逾時，請重新申請。");
+                setWarningText(intl.formatMessage({id: 'MSG.proofOutOfTime'}));
                 setIsWarningPopUp(true);
                 return;
             }
@@ -80,7 +80,12 @@ const FormPanel = ({ formData }) => {
                     vaild: values.vaild,
                 },
                 files: attachments ? attachments : [],
-                onSuccess: function () {
+                onSuccess: function (responseData) {
+                    if(responseData.msg){
+                        setWarningText(intl.formatMessage({id: 'MSG.proofOutOfTime'}));
+                        setIsWarningPopUp(true);
+                        return;
+                    }
                     notifyActionSuccess("提交成功!")
                     if (actionValue) {
                         navigate("/proof/pay/" + params.id);
@@ -127,10 +132,10 @@ const FormPanel = ({ formData }) => {
     }
 
     const isOverTime = () => {
-        let proofPaymentDeadline = DateUtils.convertToDate(formik.values?.proofPaymentDeadline);
-        if (!proofPaymentDeadline) return true;
+        let reviseDeadline = DateUtils.convertToDate(formik.values?.reviseDeadline);
+        if (!reviseDeadline) return true;
         let current = new Date();
-        return current.getTime() > proofPaymentDeadline;
+        return current.getTime() > reviseDeadline;
     }
 
 

src/translations/en.json

@@ -74,8 +74,6 @@
   "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.",
 
-
-
   "registerTitle1": "Become",
   "registerTitle2": "Gazette Notice",
   "registerTitle3": "Publisher now",

src/translations/zh-CN.json

@@ -439,7 +439,7 @@
   "creditorAccount": "债权人帐户",
   "nameEng": "姓名 (英文)",
   "nameChi": "姓名 (中文)",
-  "expiryDate": "过期日期",
+  "expiryDate": "屆滿日期",
   "create": "创建",
   "confirmTo": "确定",
 

src/translations/zh-HK.json

@@ -442,7 +442,7 @@
   "creditorAccount": "債權人帳戶",
   "nameEng": "姓名 (英文)",
   "nameChi": "姓名 (中文)",
-  "expiryDate": "過期日期",
+  "expiryDate": "屆滿日期",
   "create": "創建",
   "confirmTo": "確定",