diff --git a/src/modules/reports/shared/configs/transaction-report/configs/income-per-item-master.ts b/src/modules/reports/shared/configs/transaction-report/configs/income-per-item-master.ts index 62d46e8..9ab4af5 100644 --- a/src/modules/reports/shared/configs/transaction-report/configs/income-per-item-master.ts +++ b/src/modules/reports/shared/configs/transaction-report/configs/income-per-item-master.ts @@ -19,6 +19,7 @@ export default { LEFT JOIN refunds refund ON refund.transaction_id = main.id LEFT JOIN refund_items refund_item ON refund_item.refund_item_id = tr_item.item_id::uuid LEFT JOIN items item ON item.id::text = tr_item.item_id::text + LEFT JOIN time_groups tg on tg.id = item.time_group_id LEFT JOIN users tenant ON tenant.id::text = item.tenant_id::text`, main_table_alias: 'main', whereDefaultConditions: [ @@ -111,6 +112,13 @@ export default { type: DATA_TYPE.DIMENSION, format: DATA_FORMAT.TEXT, }, + { + column: 'tg__name', + query: 'tg.name', + label: 'Time Group', + type: DATA_TYPE.DIMENSION, + format: DATA_FORMAT.TEXT, + }, { column: 'tr_item__item_name', query: `CASE WHEN tr_item.item_type = 'bundling' THEN tr_item_bundling.item_name ELSE tr_item.item_name END`, @@ -338,6 +346,12 @@ export default { field_type: FILTER_FIELD_TYPE.input_tag, filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS, }, + { + filed_label: 'Time Group', + filter_column: 'tg__name', + field_type: FILTER_FIELD_TYPE.input_tag, + filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS, + }, { filed_label: 'Tipe Pelanggan', filter_column: 'main__customer_type', diff --git a/src/modules/reports/shared/configs/transaction-report/configs/income-per-item.ts b/src/modules/reports/shared/configs/transaction-report/configs/income-per-item.ts index e091d99..277b090 100644 --- a/src/modules/reports/shared/configs/transaction-report/configs/income-per-item.ts +++ b/src/modules/reports/shared/configs/transaction-report/configs/income-per-item.ts @@ -18,6 +18,7 @@ export default { LEFT JOIN refunds refund ON refund.transaction_id = main.id LEFT JOIN refund_items refund_item ON refund_item.refund_item_id = tr_item.item_id::uuid LEFT JOIN items item ON item.id::text = tr_item.item_id::text + LEFT JOIN time_groups tg on tg.id = item.time_group_id LEFT JOIN users tenant ON tenant.id::text = item.tenant_id::text`, main_table_alias: 'main', whereDefaultConditions: [ @@ -109,6 +110,13 @@ export default { type: DATA_TYPE.DIMENSION, format: DATA_FORMAT.TEXT, }, + { + column: 'tg__name', + query: 'tg.name', + label: 'Time Group', + type: DATA_TYPE.DIMENSION, + format: DATA_FORMAT.TEXT, + }, { column: 'main__customer_type', query: 'main.customer_type', @@ -296,6 +304,12 @@ export default { field_type: FILTER_FIELD_TYPE.input_tag, filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS, }, + { + filed_label: 'Time Group', + filter_column: 'tg__name', + field_type: FILTER_FIELD_TYPE.input_tag, + filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS, + }, { filed_label: 'Tipe Pelanggan', filter_column: 'main__customer_type',