From 6c5019f814d8670646be2ec5f8292e49110b86dd Mon Sep 17 00:00:00 2001 From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com> Date: Wed, 11 Sep 2024 10:51:10 +0700 Subject: [PATCH] feat: adjustment dpp and total pajak di report icom per transaction --- .../configs/income-per-item-master.ts | 16 ++++++++++++++-- .../configs/income-per-item.ts | 16 ++++++++++++++-- 2 files changed, 28 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 8b83568..c0a8d36 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 @@ -127,8 +127,20 @@ export default { type: DATA_TYPE.MEASURE, format: DATA_FORMAT.CURRENCY, }, - // TODO => tambahkan total dpp per item - // TODO => tambahkan total tax + { + column: 'tr_item__payment_total_dpp', + query: 'tr_item.payment_total_dpp', + label: 'DPP', + type: DATA_TYPE.MEASURE, + format: DATA_FORMAT.CURRENCY, + }, + { + column: 'tr_item__payment_total_tax', + query: 'tr_item.payment_total_tax', + label: 'Total Pajak', + type: DATA_TYPE.MEASURE, + format: DATA_FORMAT.CURRENCY, + }, { column: 'tr_item__total_price', query: 'tr_item.total_price', 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 4f43749..0889a41 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 @@ -112,8 +112,20 @@ export default { type: DATA_TYPE.MEASURE, format: DATA_FORMAT.CURRENCY, }, - // TODO => tambahkan total dpp per item - // TODO => tambahkan total tax + { + column: 'tr_item__payment_total_dpp', + query: 'tr_item.payment_total_dpp', + label: 'DPP', + type: DATA_TYPE.MEASURE, + format: DATA_FORMAT.CURRENCY, + }, + { + column: 'tr_item__payment_total_tax', + query: 'tr_item.payment_total_tax', + label: 'Total Pajak', + type: DATA_TYPE.MEASURE, + format: DATA_FORMAT.CURRENCY, + }, { column: 'tr_item__total_price', query: 'tr_item.total_price',