Dockerfile

@@ -2,8 +2,8 @@ FROM node:18.17-alpine as builder
 RUN apk add --no-cache git
 WORKDIR /app
 COPY . .
-RUN yarn install
+RUN npm install
-RUN yarn build
+RUN npm run build
 FROM node:18.17-alpine
 ARG env_target
 WORKDIR /app

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

@@ -127,13 +127,6 @@ 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',
@@ -149,16 +142,9 @@ export default <ReportConfigEntity>{
       format: DATA_FORMAT.CURRENCY,
     },
     {
-      column: 'tr_item_bundling__total_profit_share',
+      column: 'tr_item__total_price',
-      query: 'tr_item_bundling.total_profit_share',
+      query: 'tr_item.total_price',
-      label: 'Profit Share',
+      label: 'Total Penjualan',
-      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,
     },

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

@@ -112,13 +112,6 @@ 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',
@@ -134,16 +127,9 @@ export default <ReportConfigEntity>{
       format: DATA_FORMAT.CURRENCY,
     },
     {
-      column: 'tr_item__total_profit_share',
+      column: 'tr_item__total_price',
-      query: 'tr_item.total_profit_share',
+      query: 'tr_item.total_price',
-      label: 'Profit Share',
+      label: 'Total Penjualan',
-      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,
     },

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

@@ -102,9 +102,16 @@ export default <ReportConfigEntity>{
       format: DATA_FORMAT.CURRENCY,
     },
     {
-      column: 'main__payment_sub_total',
+      column: 'main__payment_total_dpp',
-      query: 'main.payment_sub_total',
+      query: 'main.payment_total_dpp',
-      label: 'Subtotal',
+      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,
     },
@@ -129,27 +136,6 @@ 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',