From 43deb04d92b243401e4cc236737d762bc7709b6e Mon Sep 17 00:00:00 2001
From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com>
Date: Thu, 19 Sep 2024 18:22:19 +0700
Subject: [PATCH] feat(SPG-966): fix report income

---
 .../configs/transaction-report/configs/cash-withdrawals.ts   | 3 +++
 .../configs/transaction-report/configs/giving-discounts.ts   | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/src/modules/reports/shared/configs/transaction-report/configs/cash-withdrawals.ts b/src/modules/reports/shared/configs/transaction-report/configs/cash-withdrawals.ts
index 141dc72..0631429 100644
--- a/src/modules/reports/shared/configs/transaction-report/configs/cash-withdrawals.ts
+++ b/src/modules/reports/shared/configs/transaction-report/configs/cash-withdrawals.ts
@@ -98,4 +98,7 @@ export default <ReportConfigEntity>{
       filter_type: FILTER_TYPE.NUMBER_EQUAL,
     },
   ],
+  whereCondition(filterModel) {
+    return [`main.created_at is not null`];
+  },
 };
diff --git a/src/modules/reports/shared/configs/transaction-report/configs/giving-discounts.ts b/src/modules/reports/shared/configs/transaction-report/configs/giving-discounts.ts
index 026fc6d..52815ca 100644
--- a/src/modules/reports/shared/configs/transaction-report/configs/giving-discounts.ts
+++ b/src/modules/reports/shared/configs/transaction-report/configs/giving-discounts.ts
@@ -31,6 +31,11 @@ export default <ReportConfigEntity>{
       filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
       values: [TransactionType.COUNTER],
     },
+    {
+      column: 'main.is_recap_transaction',
+      filter_type: FILTER_TYPE.TEXT_EQUAL,
+      values: [false],
+    },
   ],
   defaultOrderBy: [],
   lowLevelOrderBy: [],