From 5866a393eaf16ed7fe6620b1cff4bebce656783f Mon Sep 17 00:00:00 2001 From: Alex Cheung Date: Wed, 24 Sep 2025 16:34:54 +0800 Subject: [PATCH] add issue check for target date --- src/pages/PublicNotice/ApplyForm/index.js | 49 +++++++++++++++++++---- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/src/pages/PublicNotice/ApplyForm/index.js b/src/pages/PublicNotice/ApplyForm/index.js index b445939..d7b38e8 100644 --- a/src/pages/PublicNotice/ApplyForm/index.js +++ b/src/pages/PublicNotice/ApplyForm/index.js @@ -20,7 +20,7 @@ const PublicNoticeApplyForm = Loadable(lazy(() => import('./PublicNoticeApplyFor import { // isORGLoggedIn, isDummyLoggedIn, - // checkIsOnlyOnlinePaymentByIssueDate + checkIsOnlyOnlinePaymentByIssueDate // isCreditorLoggedIn } from "utils/Utils"; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -57,14 +57,47 @@ const ApplyForm = () => { response["faxNumber"] = ""; } - var selection = []; - for (var i = 0; i < response?.gazetteIssueList?.length; i++) { - let data = response.gazetteIssueList[i]; - //let label = getIssueLabel(data); - selection.push(} label={getIssueLabel(data)} />); + if (response?.gazetteIssueList) { + const issueList = response.gazetteIssueList; + + // check each issue + const allTrue = issueList.every((d) => + checkIsOnlyOnlinePaymentByIssueDate(d.issueDate) + ); + + if (allTrue){ + // either way, always render all issues + const selection = issueList.map((data) => ( + } + label={getIssueLabel(data)} + /> + )); + + setGazetteIssueList(issueList); + setSelection(selection); + } else { + let selection = []; + for (let i = 0; i < response.gazetteIssueList.length; i++) { + let data = response.gazetteIssueList[i]; + // only add if false + if (!checkIsOnlyOnlinePaymentByIssueDate(data.issueDate)) { + selection.push( + } + label={getIssueLabel(data)} + /> + ); + } + } + setGazetteIssueList(issueList); + setSelection(selection); + } } - setGazetteIssueList(response?.gazetteIssueList); - setSelection(selection); setUserData(response); // setOnlyOnlinePayment(checkIsOnlyOnlinePayment()) }