From 1f3099d30be281de8e268f4260d9b93e57ed33b9 Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Thu, 25 Sep 2025 02:31:42 +0800
Subject: [PATCH] update checking

---
 src/pages/PublicNotice/ApplyForm/index.js | 8 +++-----
 src/utils/Utils.js                        | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/pages/PublicNotice/ApplyForm/index.js b/src/pages/PublicNotice/ApplyForm/index.js
index 72844db..6b7b7e0 100644
--- a/src/pages/PublicNotice/ApplyForm/index.js
+++ b/src/pages/PublicNotice/ApplyForm/index.js
@@ -93,11 +93,9 @@ const ApplyForm = () => {
                                         label={getIssueLabel(data)}
                                     />
                                 );
-                                setGazetteIssueList(issueList);
-                                setSelection(selection);
                             }
                             if (checkIsOnlyOnlinePayment()){
-                                if (checkIsOnlyOnlinePaymentByIssueDate(data.issueDate)) {
+                                if (!checkIsOnlyOnlinePaymentByIssueDate(data.issueDate)) {
                                     selection.push(
                                         <FormControlLabel
                                             key={data.id}
@@ -106,11 +104,11 @@ const ApplyForm = () => {
                                             label={getIssueLabel(data)}
                                         />
                                     );
-                                    setGazetteIssueList(issueList);
-                                    setSelection(selection);
                                 }
                             }
                         }
+                        setGazetteIssueList(issueList);
+                        setSelection(selection);
                     }
                 }
                 setUserData(response);
diff --git a/src/utils/Utils.js b/src/utils/Utils.js
index 89fa95e..ee236bb 100644
--- a/src/utils/Utils.js
+++ b/src/utils/Utils.js
@@ -195,7 +195,7 @@ export const isPasswordExpiry = () =>{
 
 export const checkIsOnlyOnlinePaymentByIssueDate = (date) => {
     // const targetDate = new Date(2025, 7, 1, 0, 0, 0) //2026-01-28T08:00:00.000Z hardcode
-    const targetDate = new Date(2025, 9, 17, 8, 0, 0) //2025-10-17T08:00:00.000Z
+    const targetDate = new Date(2025, 9, 17, 0, 0, 0) //2025-10-17T08:00:00.000Z
     const checkDate = DateUtils.convertToDate(date)
     if (isDummyLoggedIn()){
         return false;
@@ -211,7 +211,7 @@ export const checkIsOnlyOnlinePaymentByIssueDate = (date) => {
 
 export const checkIsOnlyOnlinePayment = () => {
     // const targetDate = new Date(2025, 28, 0, 0, 0, 0) // hardcode
-    const targetDate = new Date(2025, 9, 10, 0, 0, 0) // hardcode
+    const targetDate = new Date(2025, 9, 8, 0, 0, 0) // hardcode
     const checkDate = DateUtils.convertToDate(new Date())
     if (isDummyLoggedIn()){
         return false;