Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development

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`];
-  },
 };

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',

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,