From 01fbedab77db0995a3cb0e20d81c874f1c711db8 Mon Sep 17 00:00:00 2001 From: irfan Date: Fri, 13 Sep 2024 10:37:15 +0000 Subject: [PATCH] fix: income report --- .../transaction-report/configs/income.ts | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) 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 5fc0a77..0e5e5d5 100644 --- a/src/modules/reports/shared/configs/transaction-report/configs/income.ts +++ b/src/modules/reports/shared/configs/transaction-report/configs/income.ts @@ -102,16 +102,9 @@ export default { format: DATA_FORMAT.CURRENCY, }, { - column: 'main__payment_total_dpp', - query: 'main.payment_total_dpp', - label: 'DPP', - type: DATA_TYPE.MEASURE, - format: DATA_FORMAT.CURRENCY, - }, - { - column: 'main__payment_total_tax', - query: 'main.payment_total_tax', - label: 'Total Pajak', + column: 'main__payment_sub_total', + query: 'main.payment_sub_total', + label: 'Subtotal', type: DATA_TYPE.MEASURE, format: DATA_FORMAT.CURRENCY, }, @@ -136,6 +129,27 @@ export default { type: DATA_TYPE.MEASURE, format: DATA_FORMAT.CURRENCY, }, + { + column: 'main__payment_total_dpp', + query: 'main.payment_total_dpp', + label: 'DPP', + type: DATA_TYPE.MEASURE, + format: DATA_FORMAT.CURRENCY, + }, + { + column: 'main__payment_total_tax', + query: 'main.payment_total_tax', + label: 'Total Pajak', + type: DATA_TYPE.MEASURE, + format: DATA_FORMAT.CURRENCY, + }, + { + column: 'main__payment_total_share', + query: 'main.payment_total_share', + label: 'Profit Share', + type: DATA_TYPE.MEASURE, + format: DATA_FORMAT.CURRENCY, + }, { column: 'refund__refund_date', query: 'refund.refund_date',