From 8d66f29ab7d1024ef0f0a165f93f553411b6d507 Mon Sep 17 00:00:00 2001 From: Alex Cheung Date: Wed, 20 Mar 2024 10:26:25 +0800 Subject: [PATCH] fix payment block wrong status --- src/pages/Proof/Payment/Pay.js | 2 +- src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js | 2 +- src/pages/PublicNotice/ListPanel/PendingPaymentTab.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/Proof/Payment/Pay.js b/src/pages/Proof/Payment/Pay.js index 265ed7a..a01864d 100644 --- a/src/pages/Proof/Payment/Pay.js +++ b/src/pages/Proof/Payment/Pay.js @@ -100,7 +100,7 @@ const Index = () => { }); const latestDataObjects = Object.values(latestData); - const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 && item.status !== "APPR"); + const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || 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 dde1124..bb832cc 100644 --- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js @@ -149,7 +149,7 @@ const ApplicationDetailCard = ( }); const latestDataObjects = Object.values(latestData); - const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 && item.status !== "APPR"); + const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || 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/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js index 7b092dd..20cbf65 100644 --- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js +++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js @@ -138,7 +138,7 @@ export default function SubmittedTab({ rows }) { }); const latestDataObjects = Object.values(latestData); - const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 && item.status !== "APPR"); + const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR"); const filteredAppIds = filteredData.map(item => item.appId); const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));