From b16edb73e31cce3001bfaeac522b373e9e8c6f12 Mon Sep 17 00:00:00 2001 From: shancheas Date: Fri, 20 Sep 2024 13:01:38 +0700 Subject: [PATCH] fix: report wrong non bundling profit share key --- .../configs/income-per-item-master.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 64861c8..4e54307 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 @@ -155,28 +155,32 @@ export default { }, { column: 'tr_item_bundling__payment_total_dpp', - query: 'tr_item_bundling.payment_total_dpp', + query: + 'CASE WHEN tr_item_bundling.payment_total_dpp is not null THEN tr_item_bundling.payment_total_dpp ELSE tr_item.payment_total_dpp END', label: 'DPP', type: DATA_TYPE.MEASURE, format: DATA_FORMAT.CURRENCY, }, { column: 'tr_item_bundling__payment_total_tax', - query: 'tr_item_bundling.payment_total_tax', + query: + 'CASE WHEN tr_item_bundling.payment_total_tax is not null THEN tr_item_bundling.payment_total_tax ELSE tr_item.payment_total_tax END', label: 'Total Pajak', type: DATA_TYPE.MEASURE, format: DATA_FORMAT.CURRENCY, }, { column: 'tr_item_bundling__total_profit_share', - query: 'tr_item_bundling.total_profit_share', + query: + 'CASE WHEN tr_item_bundling.total_profit_share is not null THEN tr_item_bundling.total_profit_share ELSE tr_item.total_profit_share END', label: 'Profit Share', type: DATA_TYPE.MEASURE, format: DATA_FORMAT.CURRENCY, }, { column: 'tr_item_bundling__total_share_tenant', - query: 'tr_item_bundling.total_share_tenant', + query: + 'CASE WHEN tr_item_bundling.total_share_tenant is not null THEN tr_item_bundling.total_share_tenant ELSE tr_item.total_share_tenant END', label: 'Tenant Share', type: DATA_TYPE.MEASURE, format: DATA_FORMAT.CURRENCY,