Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into feat/adjustment-report

Merge pull request 'fix/income-report' (#91 ) from fix/income-report into development
Reviewed-on: #91
2024-09-18 16:25:39 +07:00 · 2024-09-13 10:39:52 +00:00 · 2024-09-13 10:39:04 +00:00 · 2024-09-13 10:38:32 +00:00 · 2024-09-13 10:37:15 +00:00 · 2024-09-13 03:55:52 +00:00
4 changed files with 60 additions and 18 deletions
--- a/4
+++ b/4
@ -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
--- 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,
    },
--- 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,
    },
--- 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',
Author	SHA1	Message	Date
Firman Ramdhani	c76594d767	Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into feat/adjustment-report continuous-integration/drone/push Build is passing Details	2024-09-18 16:25:39 +07:00
irfan	f7c49d27d5	Merge pull request 'fix/income-report' (#91 ) from fix/income-report into development continuous-integration/drone/push Build was killed Details continuous-integration/drone/tag Build is passing Details Reviewed-on: #91	2024-09-13 10:39:52 +00:00
irfan	2ee96a617f	fix: income item breakdown report continuous-integration/drone/push Build was killed Details	2024-09-13 10:39:04 +00:00
irfan	10049abc55	fix: income item report continuous-integration/drone/push Build is passing Details	2024-09-13 10:38:32 +00:00
irfan	01fbedab77	fix: income report continuous-integration/drone/push Build is passing Details	2024-09-13 10:37:15 +00:00
irfan	b2659def9a	ci: rollback to yarn, NPM is s*ck continuous-integration/drone/push Build is passing Details	2024-09-13 03:55:52 +00:00