From c15b4d80792c469b73d3cefb32b7c2a9422ba037 Mon Sep 17 00:00:00 2001
From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com>
Date: Fri, 20 Sep 2024 17:25:28 +0700
Subject: [PATCH] feat: fix filter report

---
 .../transaction-report/configs/cash-withdrawals.ts       | 6 +++---
 .../configs/transaction-report/configs/cashier-log.ts    | 3 +++
 .../transaction-report/configs/giving-discounts.ts       | 9 +++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

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 68788f8..a8dd829 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
@@ -26,6 +26,9 @@ export default <ReportConfigEntity>{
       values: [PosLogType.cash_witdrawal],
     },
   ],
+  whereCondition(filterModel) {
+    return [`main.created_at is not null`];
+  },
   column_configs: [
     {
       column: 'main__date',
@@ -105,7 +108,4 @@ 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/cashier-log.ts b/src/modules/reports/shared/configs/transaction-report/configs/cashier-log.ts
index ce9808f..8020e49 100644
--- a/src/modules/reports/shared/configs/transaction-report/configs/cashier-log.ts
+++ b/src/modules/reports/shared/configs/transaction-report/configs/cashier-log.ts
@@ -26,6 +26,9 @@ export default <ReportConfigEntity>{
       values: [PosLogType.login, PosLogType.logout],
     },
   ],
+  whereCondition(filterModel) {
+    return [`main.creator_name is not null`];
+  },
   column_configs: [
     {
       column: 'main__date',
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 bc1c3b1..44bf86e 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
@@ -37,6 +37,11 @@ export default <ReportConfigEntity>{
       values: [false],
     },
   ],
+  whereCondition(filterModel) {
+    return [
+      `main.discount_percentage is not null or main.discount_value is not null`,
+    ];
+  },
   defaultOrderBy: [],
   lowLevelOrderBy: [],
   filter_period_config: {
@@ -73,8 +78,8 @@ export default <ReportConfigEntity>{
       format: DATA_FORMAT.TEXT,
     },
     {
-      column: 'main__payment_total_profit',
-      query: 'main.payment_total_profit',
+      column: 'main__payment_sub_total',
+      query: 'main.payment_sub_total',
       label: 'Total Transaksi',
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.CURRENCY,