Compare commits

..

No commits in common. "1e9cc9da4ff8d907abab0eee5b507d009735a536" and "33f955c209afcc6eb0f883816704795b7e737468" have entirely different histories.

2 changed files with 6 additions and 13 deletions

View File

@ -16,13 +16,6 @@ export default <ReportConfigEntity>{
table_schema: `transactions AS main table_schema: `transactions AS main
LEFT JOIN refunds refund ON refund.transaction_id = main.id`, LEFT JOIN refunds refund ON refund.transaction_id = main.id`,
main_table_alias: 'main', main_table_alias: 'main',
whereDefaultConditions: [
{
column: 'main.type',
filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
values: [TransactionType.ADMIN, TransactionType.ONLINE],
},
],
defaultOrderBy: [], defaultOrderBy: [],
lowLevelOrderBy: [], lowLevelOrderBy: [],
filter_period_config: { filter_period_config: {
@ -48,7 +41,7 @@ export default <ReportConfigEntity>{
{ {
column: 'main__no_of_group', column: 'main__no_of_group',
query: 'main.no_of_group', query: 'main.no_of_group',
label: '#Visitor', label: 'Total Group',
type: DATA_TYPE.DIMENSION, type: DATA_TYPE.DIMENSION,
format: DATA_FORMAT.NUMBER, format: DATA_FORMAT.NUMBER,
}, },

View File

@ -37,11 +37,11 @@ export interface ReportConfigEntity {
table_schema: string; table_schema: string;
main_table_alias?: string; main_table_alias?: string;
// customVirtualTableSchema?( customVirtualTableSchema?(
// filterModel: any, filterModel: any,
// findQueryConfig: (column: string) => string, findQueryConfig: (column: string) => string,
// createFilterSql: (key: string, item: any) => string, createFilterSql: (key: string, item: any) => string,
// ): string; ): string;
whereCondition?(filterModel: any): string[]; whereCondition?(filterModel: any): string[];
whereDefaultConditions?: { whereDefaultConditions?: {
column: string; column: string;