eigen
/
pos-be
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 295 Wiki Activity

fix: report wrong non bundling profit share key
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details

pull/98/head^2 20.1.70-alpha.2
shancheas 2024-09-20 13:01:38 +07:00
parent ea58096287
commit b16edb73e3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,28 +155,32 @@ export default <ReportConfigEntity>{
}, },
{ {
column: 'tr_item_bundling__payment_total_dpp', column: 'tr_item_bundling__payment_total_dpp',
query: 'tr_item_bundling.payment_total_dpp', query:
'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',
label: 'DPP', label: 'DPP',
type: DATA_TYPE.MEASURE, type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY, format: DATA_FORMAT.CURRENCY,
}, },
{ {
column: 'tr_item_bundling__payment_total_tax', column: 'tr_item_bundling__payment_total_tax',
query: 'tr_item_bundling.payment_total_tax', query:
'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',
label: 'Total Pajak', label: 'Total Pajak',
type: DATA_TYPE.MEASURE, type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY, format: DATA_FORMAT.CURRENCY,
}, },
{ {
column: 'tr_item_bundling__total_profit_share', column: 'tr_item_bundling__total_profit_share',
query: 'tr_item_bundling.total_profit_share', query:
'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',
label: 'Profit Share', label: 'Profit Share',
type: DATA_TYPE.MEASURE, type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY, format: DATA_FORMAT.CURRENCY,
}, },
{ {
column: 'tr_item_bundling__total_share_tenant', column: 'tr_item_bundling__total_share_tenant',
query: 'tr_item_bundling.total_share_tenant', query:
'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',
label: 'Tenant Share', label: 'Tenant Share',
type: DATA_TYPE.MEASURE, type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY, format: DATA_FORMAT.CURRENCY,