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 ef2e131..090b5e9 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 @@ -58,14 +58,14 @@ export default { }, { column: 'main__invoice_code', - query: 'main.invoice_code', + query: `CASE WHEN main.type != 'counter' THEN main.invoice_code ELSE null END`, label: 'Kode Booking', type: DATA_TYPE.DIMENSION, format: DATA_FORMAT.TEXT, }, { column: 'main__payment_code', - query: 'main.payment_code', + query: `CASE WHEN main.type = 'counter' THEN main.invoice_code ELSE main.payment_code END`, label: 'Kode Pembayaran', type: DATA_TYPE.DIMENSION, format: DATA_FORMAT.TEXT, diff --git a/src/modules/reports/shared/configs/transaction-report/configs/income.ts b/src/modules/reports/shared/configs/transaction-report/configs/income.ts index 45f4d5d..b4897ea 100644 --- a/src/modules/reports/shared/configs/transaction-report/configs/income.ts +++ b/src/modules/reports/shared/configs/transaction-report/configs/income.ts @@ -61,14 +61,14 @@ export default { }, { column: 'main__invoice_code', - query: 'main.invoice_code', + query: `CASE WHEN main.type != 'counter' THEN main.invoice_code ELSE null END`, label: 'Kode Booking', type: DATA_TYPE.DIMENSION, format: DATA_FORMAT.TEXT, }, { column: 'main__payment_code', - query: 'main.payment_code', + query: `CASE WHEN main.type = 'counter' THEN main.invoice_code ELSE main.payment_code END`, label: 'Kode Pembayaran', type: DATA_TYPE.DIMENSION, format: DATA_FORMAT.TEXT,