From 1e9cc9da4ff8d907abab0eee5b507d009735a536 Mon Sep 17 00:00:00 2001 From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com> Date: Thu, 1 Aug 2024 15:13:00 +0700 Subject: [PATCH] feat: add default condition for type on booking report --- .../configs/transaction-report/configs/booking.ts | 7 +++++++ .../reports/shared/entities/report-config.entity.ts | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/modules/reports/shared/configs/transaction-report/configs/booking.ts b/src/modules/reports/shared/configs/transaction-report/configs/booking.ts index eda58e3..2c31c22 100644 --- a/src/modules/reports/shared/configs/transaction-report/configs/booking.ts +++ b/src/modules/reports/shared/configs/transaction-report/configs/booking.ts @@ -16,6 +16,13 @@ export default { table_schema: `transactions AS main LEFT JOIN refunds refund ON refund.transaction_id = main.id`, main_table_alias: 'main', + whereDefaultConditions: [ + { + column: 'main.type', + filter_type: FILTER_TYPE.TEXT_IN_MEMBER, + values: [TransactionType.ADMIN, TransactionType.ONLINE], + }, + ], defaultOrderBy: [], lowLevelOrderBy: [], filter_period_config: { diff --git a/src/modules/reports/shared/entities/report-config.entity.ts b/src/modules/reports/shared/entities/report-config.entity.ts index bca0f5c..71598b8 100644 --- a/src/modules/reports/shared/entities/report-config.entity.ts +++ b/src/modules/reports/shared/entities/report-config.entity.ts @@ -37,11 +37,11 @@ export interface ReportConfigEntity { table_schema: string; main_table_alias?: string; - customVirtualTableSchema?( - filterModel: any, - findQueryConfig: (column: string) => string, - createFilterSql: (key: string, item: any) => string, - ): string; + // customVirtualTableSchema?( + // filterModel: any, + // findQueryConfig: (column: string) => string, + // createFilterSql: (key: string, item: any) => string, + // ): string; whereCondition?(filterModel: any): string[]; whereDefaultConditions?: { column: string;