diff --git a/Dockerfile b/Dockerfile
index 9e4d87e..9b354f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,8 @@ FROM node:18.17-alpine as builder
 RUN apk add --no-cache git
 WORKDIR /app
 COPY . .
-RUN npm install
-RUN npm run build
+RUN yarn install
+RUN yarn build
 FROM node:18.17-alpine
 ARG env_target
 WORKDIR /app
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 6b25b35..0de61c5 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,6 +127,13 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.CURRENCY,
     },
+    {
+      column: 'tr_item__total_price',
+      query: 'tr_item.total_price',
+      label: 'Total Penjualan',
+      type: DATA_TYPE.MEASURE,
+      format: DATA_FORMAT.CURRENCY,
+    },
     {
       column: 'tr_item_bundling__payment_total_dpp',
       query: 'tr_item_bundling.payment_total_dpp',
@@ -142,9 +149,16 @@ export default <ReportConfigEntity>{
       format: DATA_FORMAT.CURRENCY,
     },
     {
-      column: 'tr_item__total_price',
-      query: 'tr_item.total_price',
-      label: 'Total Penjualan',
+      column: 'tr_item_bundling__total_profit_share',
+      query: 'tr_item_bundling.total_profit_share',
+      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',
+      label: 'Tenant Share',
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.CURRENCY,
     },
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 0889a41..9cb1684 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,6 +112,13 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.CURRENCY,
     },
+    {
+      column: 'tr_item__total_price',
+      query: 'tr_item.total_price',
+      label: 'Total Penjualan',
+      type: DATA_TYPE.MEASURE,
+      format: DATA_FORMAT.CURRENCY,
+    },
     {
       column: 'tr_item__payment_total_dpp',
       query: 'tr_item.payment_total_dpp',
@@ -127,9 +134,16 @@ export default <ReportConfigEntity>{
       format: DATA_FORMAT.CURRENCY,
     },
     {
-      column: 'tr_item__total_price',
-      query: 'tr_item.total_price',
-      label: 'Total Penjualan',
+      column: 'tr_item__total_profit_share',
+      query: 'tr_item.total_profit_share',
+      label: 'Profit Share',
+      type: DATA_TYPE.MEASURE,
+      format: DATA_FORMAT.CURRENCY,
+    },
+    {
+      column: 'tr_item__total_share_tenant',
+      query: 'tr_item.total_share_tenant',
+      label: 'Tenant Share',
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.CURRENCY,
     },
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 <ReportConfigEntity>{
       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 <ReportConfigEntity>{
       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',