From 5772daa749a33c53bb831a96c1b3890ce1c79fb6 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Fri, 10 May 2024 18:30:15 +0800
Subject: [PATCH] update

---
 src/auth/utils.js                                         | 2 +-
 src/pages/Proof/Reply_Public/ProofForm.js                 | 2 +-
 src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js | 8 ++++----
 src/translations/en.json                                  | 1 +
 src/translations/zh-CN.json                               | 1 +
 src/translations/zh-HK.json                               | 1 +
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/auth/utils.js b/src/auth/utils.js
index 25c5dd7..80d5aef 100644
--- a/src/auth/utils.js
+++ b/src/auth/utils.js
@@ -141,5 +141,5 @@ export const getPaymentMethod = (paymentMethod) => {
   if(paymentMethod == "online") return 'payOnlineMethod';
   if(paymentMethod == "demandNote") return 'payDnMethod';
   if(paymentMethod == "office") return 'payNPGOMethod';
-  // return null;
+  return "other";
 }
\ No newline at end of file
diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js
index 443a86f..4cb9e47 100644
--- a/src/pages/Proof/Reply_Public/ProofForm.js
+++ b/src/pages/Proof/Reply_Public/ProofForm.js
@@ -107,7 +107,7 @@ const FormPanel = ({ formData }) => {
                 files: attachments ? attachments : [],
                 onSuccess: function (responseData) {
                     if (responseData.msg) {
-                        setWarningText(intl.formatMessage({ id: 'MSG.proofOutOfTime' }));
+                        setWarningText(intl.formatMessage({ id: responseData.msg}));
                         setIsWarningPopUp(true);
                         return;
                     }
diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
index d14612b..f070ef0 100644
--- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
+++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
@@ -166,12 +166,12 @@ const PublicNoticeApplyForm = ({ loadedData, _selections , gazetteIssueList}) =>
 
     const apply = (values) => {
         setSubmitting(true)
-        let careOf = values.careOf ? values.careOf : ""
-        let remarks = values.remarks ? values.remarks : ""
-        if (isDummyLoggedIn){
+        let careOf = values.careOf ?? "";
+        let remarks = values.remarks ??"";
+        if (isDummyLoggedIn()){
             careOf = values.careOfDum
         }
-        if (isDummyLoggedIn){
+        if (isDummyLoggedIn()){
             remarks = values.emailAddress
         }
         HttpUtils.postWithFiles({
diff --git a/src/translations/en.json b/src/translations/en.json
index 347357f..c74377f 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -513,6 +513,7 @@
 
   "content": "Content",
   "subject": "Subject",
+  "other":"Other",
 
   "Dashboard": "Dashboard",
   "event": "Event"
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index 81d1a77..3b22a46 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -503,6 +503,7 @@
 
   "content": "内容",
   "subject": "主题",
+  "other":"其他",
 
   "Dashboard": "仪表板",
   "event": "活动"
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index f75f3ce..bb68e4e 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -508,6 +508,7 @@
 
   "content": "内容",
   "subject": "主題",
+  "other":"其他",
 
   "Dashboard": "儀表板",
   "event": "活動"