fix: income report
continuous-integration/drone/push Build is passing Details

pull/91/head
irfan 2024-09-13 10:37:15 +00:00
parent b2659def9a
commit 01fbedab77
1 changed files with 24 additions and 10 deletions

View File

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