Merge pull request 'feat: update report' (#98) from feat/adjustment-report into development

Reviewed-on: #98

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

@@ -103,7 +103,6 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
-
     {
       column: 'tr_item__item_name',
       query: `CASE WHEN tr_item.item_type = 'bundling' THEN tr_item_bundling.item_name ELSE tr_item.item_name END`,
@@ -140,47 +139,65 @@ export default <ReportConfigEntity>{
       format: DATA_FORMAT.NUMBER,
     },
     {
-      column: 'tr_item__total_hpp',
+      column: 'tr_item_bundling__hpp',
-      query: 'tr_item.total_hpp',
+      // query: 'tr_item_bundling.hpp',
+      query: `CASE WHEN tr_item.item_type != 'bundling' THEN tr_item.total_hpp ELSE tr_item_bundling.hpp END`,
       label: 'Total HPP',
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.CURRENCY,
     },
     {
-      column: 'tr_item__total_price',
+      column: 'tr_item_bundling__total_price',
-      query: 'tr_item.total_price',
+      // query: 'tr_item_bundling.total_price',
+      query: `CASE WHEN tr_item.item_type != 'bundling' THEN tr_item.total_price ELSE tr_item_bundling.total_price END`,
+      label: 'Subtotal',
+      type: DATA_TYPE.MEASURE,
+      format: DATA_FORMAT.CURRENCY,
+    },
+    {
+      column: 'tr_item_bundling__discount_value',
+      // query: 'tr_item_bundling.discount_value',
+      query: `CASE WHEN tr_item.item_type != 'bundling' THEN tr_item.discount_value ELSE tr_item_bundling.discount_value END`,
+      label: 'Diskon (IDR)',
+      type: DATA_TYPE.MEASURE,
+      format: DATA_FORMAT.CURRENCY,
+    },
+    {
+      column: 'tr_item_bundling__total_net_price',
+      // query: 'tr_item_bundling.total_net_price',
+      query: `CASE WHEN tr_item.item_type != 'bundling' THEN tr_item.total_net_price ELSE tr_item_bundling.total_net_price END`,
       label: 'Total Penjualan',
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.CURRENCY,
     },
     {
       column: 'tr_item_bundling__payment_total_dpp',
-      query:
+      // query: 'tr_item_bundling.payment_total_dpp',
-        'CASE WHEN tr_item_bundling.payment_total_dpp is not null THEN tr_item_bundling.payment_total_dpp ELSE tr_item.payment_total_dpp END',
+      query: `CASE WHEN tr_item.item_type != 'bundling' THEN tr_item.payment_total_dpp ELSE tr_item_bundling.payment_total_dpp END`,
       label: 'DPP',
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.CURRENCY,
     },
     {
       column: 'tr_item_bundling__payment_total_tax',
-      query:
+      // query: 'tr_item_bundling.payment_total_tax',
-        'CASE WHEN tr_item_bundling.payment_total_tax is not null THEN tr_item_bundling.payment_total_tax ELSE tr_item.payment_total_tax END',
+      query: `CASE WHEN tr_item.item_type != 'bundling' THEN tr_item.payment_total_tax ELSE tr_item_bundling.payment_total_tax END`,
       label: 'Total Pajak',
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.CURRENCY,
     },
     {
       column: 'tr_item_bundling__total_profit_share',
-      query:
+      // query: 'tr_item_bundling.total_profit_share',
-        'CASE WHEN tr_item_bundling.total_profit_share is not null THEN tr_item_bundling.total_profit_share ELSE tr_item.total_profit_share END',
+      query: `CASE WHEN tr_item.item_type != 'bundling' THEN tr_item.total_profit_share ELSE tr_item_bundling.total_profit_share END`,
       label: 'Profit Share',
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.CURRENCY,
     },
     {
       column: 'tr_item_bundling__total_share_tenant',
-      query:
+      // query: 'tr_item_bundling.total_share_tenant',
-        'CASE WHEN tr_item_bundling.total_share_tenant is not null THEN tr_item_bundling.total_share_tenant ELSE tr_item.total_share_tenant END',
+      query: `CASE WHEN tr_item.item_type != 'bundling' THEN tr_item.total_share_tenant ELSE tr_item_bundling.total_share_tenant END`,
       label: 'Tenant Share',
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.CURRENCY,
@@ -213,21 +230,6 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.NUMBER,
     },
-    {
-      column: 'tr_item__item_tenant_share_margin',
-      query: 'tr_item.item_tenant_share_margin',
-      label: 'Profile Share (IDR)',
-      type: DATA_TYPE.MEASURE,
-      format: DATA_FORMAT.CURRENCY,
-    },
-    {
-      column: 'tenant_income',
-      query: 'tr_item.total_price - tr_item.item_tenant_share_margin',
-      label: 'Pendapatan Tenant',
-      type: DATA_TYPE.MEASURE,
-      format: DATA_FORMAT.CURRENCY,
-    },
-
     {
       column: 'main__customer_name',
       query: 'main.customer_name',

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

@@ -46,6 +46,13 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
+    {
+      column: 'tr_item__item_type',
+      query: 'tr_item.item_type',
+      label: 'Tipe Item',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.TEXT,
+    },
     {
       column: 'main__status',
       query: 'main.status',
@@ -133,6 +140,20 @@ export default <ReportConfigEntity>{
     {
       column: 'tr_item__total_price',
       query: 'tr_item.total_price',
+      label: 'Subtotal',
+      type: DATA_TYPE.MEASURE,
+      format: DATA_FORMAT.CURRENCY,
+    },
+    {
+      column: 'tr_item__discount_value',
+      query: 'tr_item.discount_value',
+      label: 'Diskon (IDR)',
+      type: DATA_TYPE.MEASURE,
+      format: DATA_FORMAT.CURRENCY,
+    },
+    {
+      column: 'tr_item__total_net_price',
+      query: 'tr_item.total_net_price',
       label: 'Total Penjualan',
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.CURRENCY,
@@ -193,21 +214,6 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.NUMBER,
     },
-    {
-      column: 'tr_item__item_tenant_share_margin',
-      query: 'tr_item.item_tenant_share_margin',
-      label: 'Profile Share (IDR)',
-      type: DATA_TYPE.MEASURE,
-      format: DATA_FORMAT.CURRENCY,
-    },
-    {
-      column: 'tenant_income',
-      query: 'tr_item.total_price - tr_item.item_tenant_share_margin',
-      label: 'Pendapatan Tenant',
-      type: DATA_TYPE.MEASURE,
-      format: DATA_FORMAT.CURRENCY,
-    },
-
     {
       column: 'main__customer_name',
       query: 'main.customer_name',