From 8499cddc565b22cd8e550ce69dfc137281141a73 Mon Sep 17 00:00:00 2001 From: Alex Cheung Date: Mon, 26 Feb 2024 12:02:54 +0800 Subject: [PATCH] update cancel button before application was paid --- .../PublicNotice/Details_Public/ApplicationDetailCard.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js index 1c09b23..ab689a5 100644 --- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js @@ -167,7 +167,13 @@ const ApplicationDetailCard = ( variant="contained" onClick={cancelledClick()} color="edit" - disabled={currentApplicationDetailData.status !== "submitted"} + disabled={currentApplicationDetailData.status == "rejected" + || currentApplicationDetailData.status == "cancelled" + || (!currentApplicationDetailData.creditor + && currentApplicationDetailData.status == "paid") + || (currentApplicationDetailData.creditor + && currentApplicationDetailData.status == "confirmed") + } title={intl.formatMessage({ id: 'cancel' })} startIcon={} aria-label={intl.formatMessage({ id: 'cancel' })}