Merge pull request 'feat/adjustment-report' (#84) from feat/adjustment-report into development

Reviewed-on: #84

src/modules/reports/shared/configs/tenant-report/configs/income-per-item-master.ts

@@ -6,6 +6,7 @@ export default <ReportConfigEntity>{
   ...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;

src/modules/reports/shared/configs/tenant-report/configs/income-per-item.ts

@@ -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 <ReportConfigEntity>{
-  ...IncomeReportPerItem,
-  group_name: REPORT_GROUP.tenant_report,
-  unique_name: `${REPORT_GROUP.tenant_report}__income_per_item`,
-};

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,
 ];

src/modules/reports/shared/configs/transaction-report/configs/income-per-item-master.ts

@@ -127,8 +127,20 @@ export default <ReportConfigEntity>{
       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',

src/modules/reports/shared/configs/transaction-report/configs/income-per-item.ts

@@ -112,8 +112,20 @@ export default <ReportConfigEntity>{
       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',