From ff0ef2878335b7f36ce5239f436ee42e1e51fdc6 Mon Sep 17 00:00:00 2001 From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com> Date: Wed, 11 Sep 2024 10:40:44 +0700 Subject: [PATCH 1/2] feat: create report tenant --- .../tenant-report/configs/income-per-item-master.ts | 1 + .../configs/tenant-report/configs/income-per-item.ts | 9 --------- .../reports/shared/configs/tenant-report/index.ts | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 src/modules/reports/shared/configs/tenant-report/configs/income-per-item.ts diff --git a/src/modules/reports/shared/configs/tenant-report/configs/income-per-item-master.ts b/src/modules/reports/shared/configs/tenant-report/configs/income-per-item-master.ts index 95ba9ae..c37b543 100644 --- a/src/modules/reports/shared/configs/tenant-report/configs/income-per-item-master.ts +++ b/src/modules/reports/shared/configs/tenant-report/configs/income-per-item-master.ts @@ -6,6 +6,7 @@ export default { ...IncomeReportPerItemMaster, group_name: REPORT_GROUP.tenant_report, unique_name: `${REPORT_GROUP.tenant_report}__income_per_item_master`, + label: 'Pendapatan', whereCondition(filterModel) { const queryFilter = []; const breakdown = filterModel.tr_item__breakdown_bundling; diff --git a/src/modules/reports/shared/configs/tenant-report/configs/income-per-item.ts b/src/modules/reports/shared/configs/tenant-report/configs/income-per-item.ts deleted file mode 100644 index dfed213..0000000 --- a/src/modules/reports/shared/configs/tenant-report/configs/income-per-item.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { REPORT_GROUP } from '../../../constant'; -import { ReportConfigEntity } from '../../../entities/report-config.entity'; -import IncomeReportPerItem from '../../transaction-report/configs/income-per-item'; - -export default { - ...IncomeReportPerItem, - group_name: REPORT_GROUP.tenant_report, - unique_name: `${REPORT_GROUP.tenant_report}__income_per_item`, -}; diff --git a/src/modules/reports/shared/configs/tenant-report/index.ts b/src/modules/reports/shared/configs/tenant-report/index.ts index a1dad0a..66e925a 100644 --- a/src/modules/reports/shared/configs/tenant-report/index.ts +++ b/src/modules/reports/shared/configs/tenant-report/index.ts @@ -1,8 +1,6 @@ import { ReportConfigEntity } from '../../entities/report-config.entity'; -import IncomeReportPerItem from './configs/income-per-item'; import IncomeReportPerItemMaster from './configs/income-per-item-master'; export const TenantReportConfig: ReportConfigEntity[] = [ - IncomeReportPerItem, IncomeReportPerItemMaster, ]; 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 2/2] 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',