From f23a9f3510722b9d2ede3b553144a5f9f784ccac Mon Sep 17 00:00:00 2001 From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com> Date: Fri, 20 Sep 2024 18:32:17 +0700 Subject: [PATCH 1/2] feat: update report --- .../configs/income-per-item-master.ts | 54 ++++++++++--------- .../configs/income-per-item.ts | 36 +++++++------ 2 files changed, 51 insertions(+), 39 deletions(-) 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 64861c8..440c5b3 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 @@ -103,7 +103,6 @@ export default { 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,43 +139,65 @@ export default { format: DATA_FORMAT.NUMBER, }, { - column: 'tr_item__total_hpp', - query: 'tr_item.total_hpp', + column: 'tr_item_bundling__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', - query: 'tr_item.total_price', + column: 'tr_item_bundling__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: 'tr_item_bundling.payment_total_dpp', + // query: 'tr_item_bundling.payment_total_dpp', + 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: 'tr_item_bundling.payment_total_tax', + // query: 'tr_item_bundling.payment_total_tax', + 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: 'tr_item_bundling.total_profit_share', + // query: 'tr_item_bundling.total_profit_share', + 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: 'tr_item_bundling.total_share_tenant', + // query: 'tr_item_bundling.total_share_tenant', + 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, @@ -209,21 +230,6 @@ export default { 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', 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 be6d767..3b96f56 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 @@ -46,6 +46,13 @@ export default { 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 { { 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 { 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', From 0b8bb723921b9cda566a285640c7c04fdd87b5a5 Mon Sep 17 00:00:00 2001 From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com> Date: Fri, 20 Sep 2024 19:01:18 +0700 Subject: [PATCH 2/2] feat: move tipe item --- .../transaction-report/configs/income-per-item.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 3b96f56..6b95e10 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 @@ -46,13 +46,6 @@ export default { 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', @@ -95,6 +88,13 @@ export default { 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: 'tr_item__item_name', query: 'tr_item.item_name',