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

feat: adjustment to measure at column income report
continuous-integration/drone/push Build is passing Details

pull/81/head
Firman Ramdhani 2024-09-10 10:29:31 +07:00
parent 6fb582204a
commit bf73cb6b43
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,7 @@ export default <ReportConfigEntity>{
column: 'tr_item__qty',
query: 'tr_item.qty',
label: 'Qty',
type: DATA_TYPE.DIMENSION,
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.NUMBER,
},
{
@ -162,7 +162,7 @@ export default <ReportConfigEntity>{
column: 'refund_item__qty_refund',
query: 'refund_item.qty_refund',
label: 'Qty Pengembalian',
type: DATA_TYPE.DIMENSION,
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.NUMBER,
},
{
@ -191,7 +191,7 @@ export default <ReportConfigEntity>{
column: 'tenant_income',
query: 'tr_item.total_price - tr_item.item_tenant_share_margin',
label: 'Pendapatan Tenant',
type: DATA_TYPE.DIMENSION,
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},

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

@ -102,7 +102,7 @@ export default <ReportConfigEntity>{
column: 'tr_item__qty',
query: 'tr_item.qty',
label: 'Qty',
type: DATA_TYPE.DIMENSION,
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.NUMBER,
},
{
@ -147,7 +147,7 @@ export default <ReportConfigEntity>{
column: 'refund_item__qty_refund',
query: 'refund_item.qty_refund',
label: 'Qty Pengembalian',
type: DATA_TYPE.DIMENSION,
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.NUMBER,
},
{
@ -176,7 +176,7 @@ export default <ReportConfigEntity>{
column: 'tenant_income',
query: 'tr_item.total_price - tr_item.item_tenant_share_margin',
label: 'Pendapatan Tenant',
type: DATA_TYPE.DIMENSION,
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
@ -262,8 +262,8 @@ export default <ReportConfigEntity>{
{
filed_label: 'No. PoS',
filter_column: 'main__creator_counter_no',
field_type: FILTER_FIELD_TYPE.input_tag,
filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
field_type: FILTER_FIELD_TYPE.input_number,
filter_type: FILTER_TYPE.NUMBER_EQUAL,
},
{
filed_label: 'Tgl. Pengembalian',

14
src/modules/reports/shared/configs/transaction-report/configs/income.ts
View File

@ -133,21 +133,21 @@ export default <ReportConfigEntity>{
column: 'main__discount_value',
query: 'main.discount_value',
label: 'Diskon (IDR)',
type: DATA_TYPE.DIMENSION,
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{
column: 'main__payment_total',
query: 'main.payment_total',
label: 'Total Penjualan',
type: DATA_TYPE.DIMENSION,
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{
column: 'refund__refund_date',
query: 'refund.refund_date',
label: 'Tgl. Pengembalian',
type: DATA_TYPE.DIMENSION,
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.DATE_TIMESTAMP,
date_format: 'DD/MM/YYYY',
},
@ -169,14 +169,14 @@ export default <ReportConfigEntity>{
column: 'refund__refund_total',
query: '(refund.refund_total * -1)',
label: 'Total Pengembalian',
type: DATA_TYPE.DIMENSION,
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{
column: 'transaction_balance',
query: `CASE WHEN refund.id is null THEN main.payment_total ELSE main.payment_total - refund.refund_total END`,
label: 'Balance',
type: DATA_TYPE.DIMENSION,
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{
@ -291,8 +291,8 @@ export default <ReportConfigEntity>{
{
filed_label: 'No. PoS',
filter_column: 'main__creator_counter_no',
field_type: FILTER_FIELD_TYPE.input_tag,
filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
field_type: FILTER_FIELD_TYPE.input_number,
filter_type: FILTER_TYPE.NUMBER_EQUAL,
},
{
filed_label: 'Tgl. Pengembalian',