From 5bae1c5824e12eb4a296438bbe6cf39814c02567 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Mon, 13 May 2024 11:19:48 +0800
Subject: [PATCH] fix bug

---
 src/pages/Proof/Reply_Public/ProofForm.js | 7 ++++---
 src/translations/en.json                  | 1 +
 src/translations/zh-CN.json               | 2 ++
 src/translations/zh-HK.json               | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js
index 4cb9e47..4748c07 100644
--- a/src/pages/Proof/Reply_Public/ProofForm.js
+++ b/src/pages/Proof/Reply_Public/ProofForm.js
@@ -82,7 +82,8 @@ const FormPanel = ({ formData }) => {
                 setWarningText(intl.formatMessage({ id: 'MSG.overReviseDeadline' }));
                 setIsWarningPopUp(true);
                 return;
-            }else if ( formData.creditor==false && paymentMethod=="") {
+            }
+            else if ( formData.creditor==false && paymentMethod=="") {
                 setWarningText(intl.formatMessage({ id: 'MSG.plzSelectPaymentMethod' }));
                 setIsWarningPopUp(true);
                 return;
@@ -111,8 +112,8 @@ const FormPanel = ({ formData }) => {
                         setIsWarningPopUp(true);
                         return;
                     }
-                    notifyActionSuccess("提交成功!")
-                    if (actionValue) {
+                    if (responseData.id == params.id) {
+                        notifyActionSuccess(intl.formatMessage({id: "submitted"}))
                         navigate("/proof/pay/" + params.id);
                     } else {
                         navigate("/proof/search");
diff --git a/src/translations/en.json b/src/translations/en.json
index 898bc07..e48f270 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -36,6 +36,7 @@
   "noMoreThenNWords": "{fieldname} Must not exceed {num} characters",
   "atLeastNCharAccount": "{fieldname} Please enter at least {num} digits",
   "applyTickStr":"I acknowledge the deadlines mentioned above.",
+  "submitted": "Submitted",
 
   "MSG.registerIAmSmart": "You may click the \"iAM Smart\" button to fill the personal information automatically or enter the information manually to activate the PNSPS account now.<br/>If you want to use \"iAM Smart\" to fill the personal information, please download the \"iAM Smart\" mobile app and register as an \"iAM Smart\" user first.",
   "MSG.registerPersonal": "To complete the online application, you need to upload digital copies of identification documents.<br/>e.g. Hong Kong Identity Card, Passport, Mainland China Identity Card, Professional Practicing Certificate, etc.",
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index 95f7a04..663db84 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -36,6 +36,8 @@
   "noMoreThenNWords": "{fieldname}不得超过 {num} 个字符",
   "atLeastNCharAccount": "{fieldname}最少{num}个字符",
   "applyTickStr":"我确认上述提到的截止日期。",
+  "submitted": "提交成功",
+
     "confirmingDealine": "确认校对的截止日期",
   "PaymentCoonpletDealine": "付款截止日期",
   "payOnline":"透过此系统 GPNSPS 网上支付",
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index 292702a..2440c08 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -36,6 +36,8 @@
   "noMoreThenNWords": "{fieldname}不得超過 {num} 個字符",
   "atLeastNCharAccount": "{fieldname}最少{num}個字符",
   "applyTickStr":"我確認上述提到的日期。",
+  "submitted": "提交成功",
+  
   "confirmingDealine": "確認校對的截止日期",
   "PaymentCoonpletDealine": "付款截止日期",
   "payOnline":"透過此系統 GPNSPS 網上支付",