From b717f367091de25d409528b7034114c7736c1ff5 Mon Sep 17 00:00:00 2001
From: Jason Chuang <jchuang@2fi-solutions.com.hk>
Date: Fri, 17 Jul 2026 13:33:02 +0800
Subject: [PATCH] Revert "test payment"

This reverts commit 94a6cbd5eb8303f81637bc5ee5e3f637ed405920.
---
 src/pages/Payment/MultiPaymentWindow.js                     | 6 ++----
 src/pages/Proof/Payment/Pay.js                              | 6 ++----
 src/pages/Proof/Payment/Pay_Online.js                       | 5 +----
 .../PublicNotice/Details_Public/ApplicationDetailCard.js    | 6 ++----
 src/pages/PublicNotice/ListPanel/PendingPaymentTab.js       | 5 +----
 5 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/pages/Payment/MultiPaymentWindow.js b/src/pages/Payment/MultiPaymentWindow.js
index c72e212..976e281 100644
--- a/src/pages/Payment/MultiPaymentWindow.js
+++ b/src/pages/Payment/MultiPaymentWindow.js
@@ -217,10 +217,8 @@ const MultiPaymentWindow = (props) => {
             });
             const latestDataObjects = Object.values(latestData);
             
-            const filteredData = latestDataObjects.filter(item =>
-                item.status == "CANC" || item.status == "REJT"
-                || (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
-            );
+            // const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
+            const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");
 
             const filteredAppIds = filteredData.map(item => item.appId);
             
diff --git a/src/pages/Proof/Payment/Pay.js b/src/pages/Proof/Payment/Pay.js
index 0c2d744..ad673ed 100644
--- a/src/pages/Proof/Payment/Pay.js
+++ b/src/pages/Proof/Payment/Pay.js
@@ -62,10 +62,8 @@ const Index = ({ record }) => {
                 });
                 const latestDataObjects = Object.values(latestData);
                 
-                const filteredData = latestDataObjects.filter(item =>
-                    item.status == "CANC" || item.status == "REJT"
-                    || (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
-                );
+                // const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
+                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");
 
                 const filteredAppIds = filteredData.map(item => item.appId);
 
diff --git a/src/pages/Proof/Payment/Pay_Online.js b/src/pages/Proof/Payment/Pay_Online.js
index 546353c..3358299 100644
--- a/src/pages/Proof/Payment/Pay_Online.js
+++ b/src/pages/Proof/Payment/Pay_Online.js
@@ -140,10 +140,7 @@ const Index = () => {
                 });
                 const latestDataObjects = Object.values(latestData);
 
-                const filteredData = latestDataObjects.filter(item =>
-                    item.status == "CANC" || item.status == "REJT"
-                    || (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
-                );
+                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status !== "APPR");
                 const filteredAppIds = filteredData.map(item => item.appId);
 
                 const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));
diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
index 0597d5b..e8b5006 100644
--- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
@@ -156,10 +156,8 @@ const ApplicationDetailCard = (
                 });
                 const latestDataObjects = Object.values(latestData);
 
-                const filteredData = latestDataObjects.filter(item =>
-                    item.status == "CANC" || item.status == "REJT"
-                    || (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
-                );
+                // const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
+                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");
 
                 const filteredAppIds = filteredData.map(item => item.appId);
 
diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
index da7e488..af6677f 100644
--- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
+++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
@@ -151,10 +151,7 @@ export default function SubmittedTab({ setCount, url }) {
                 });
                 const latestDataObjects = Object.values(latestData);
                 
-                const filteredData = latestDataObjects.filter(item =>
-                    item.status == "CANC" || item.status == "REJT"
-                    || (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
-                );
+                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");
                 const filteredAppIds = filteredData.map(item => item.appId);
 
                 const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));