diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js index b12719e..eebd6b7 100644 --- a/src/pages/Proof/Reply_Public/ProofForm.js +++ b/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; } diff --git a/src/translations/en.json b/src/translations/en.json index 11f0cff..a35813a 100644 --- a/src/translations/en.json +++ b/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",