eigen
/
pos-be
11
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 344 Wiki Activity

Merge pull request 'feat/report-income' (#138) from feat/report-income into development 

Reviewed-on: #138
pull/143/head
irfan 2025-05-27 11:36:27 +07:00
parent a438cc5f83 027025935c
commit 0757d6791d
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/reports/shared/configs/transaction-report/configs/cancel-transaction.ts
View File

@ -42,9 +42,16 @@ export default <ReportConfigEntity>{
}, },
column_configs: [ column_configs: [
// {
// column: 'main__payment_date',
// query: `to_char(main.payment_date, 'DD-MM-YYYY')`,
// label: 'Tgl. Pendapatan',
// type: DATA_TYPE.DIMENSION,
// format: DATA_FORMAT.TEXT,
// },
{ {
column: 'main__payment_date', column: 'main__payment_date',
query: `to_char(main.payment_date, 'DD-MM-YYYY')`, query: `to_char(cast(to_timestamp(main.created_at/1000) as date),'DD-MM-YYYY')`,
label: 'Tgl. Pendapatan', label: 'Tgl. Pendapatan',
type: DATA_TYPE.DIMENSION, type: DATA_TYPE.DIMENSION,
format: DATA_FORMAT.TEXT, format: DATA_FORMAT.TEXT,
@ -282,15 +289,22 @@ export default <ReportConfigEntity>{
}, },
], ],
filter_configs: [ filter_configs: [
// {
// filed_label: 'Tgl. Pembatalan',
// filter_column: 'main__payment_date',
// field_type: FILTER_FIELD_TYPE.date_range_picker,
// filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
// // date_format: 'DD-MM-YYYY',
// date_format: 'YYYY-MM-DD',
// },
{ {
filed_label: 'Tgl. Pembatalan', filed_label: 'Tgl. Pembatalan',
filter_column: 'main__payment_date', filter_column: 'main__payment_date',
field_type: FILTER_FIELD_TYPE.date_range_picker, field_type: FILTER_FIELD_TYPE.date_range_picker,
filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP, filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
// date_format: 'DD-MM-YYYY', date_format: 'DD-MM-YYYY',
date_format: 'YYYY-MM-DD',
}, },
{ {
filed_label: 'Sumber', filed_label: 'Sumber',
filter_column: 'main__type', filter_column: 'main__type',
@ -392,8 +406,9 @@ export default <ReportConfigEntity>{
}, },
], ],
customQueryColumn(column) { customQueryColumn(column) {
if (column === 'main__payment_date') return 'main.payment_date'; // if (column === 'main__payment_date') return 'main.payment_date';
else if (column === 'refund__refund_date') return 'refund.refund_date'; // else if (column === 'refund__refund_date') return 'refund.refund_date';
if (column === 'refund__refund_date') return 'refund.refund_date';
return; return;
}, },
}; };

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

@ -255,7 +255,14 @@ export default <ReportConfigEntity>{
{ {
column: 'main__payment_card_information', column: 'main__payment_card_information',
query: 'main.payment_card_information', query: 'main.payment_card_information',
label: 'Information', label: 'Card Information',
type: DATA_TYPE.DIMENSION,
format: DATA_FORMAT.TEXT,
},
{
column: 'main__payment_code_reference',
query: 'main.payment_code_reference',
label: 'Payment Reference',
type: DATA_TYPE.DIMENSION, type: DATA_TYPE.DIMENSION,
format: DATA_FORMAT.TEXT, format: DATA_FORMAT.TEXT,
}, },
@ -334,6 +341,18 @@ export default <ReportConfigEntity>{
field_type: FILTER_FIELD_TYPE.input_tag, field_type: FILTER_FIELD_TYPE.input_tag,
filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS, filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
}, },
{
filed_label: 'Card Information',
filter_column: 'main__payment_card_information',
field_type: FILTER_FIELD_TYPE.input_tag,
filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
},
{
filed_label: 'Payment Reference',
filter_column: 'main__payment_code_reference',
field_type: FILTER_FIELD_TYPE.input_tag,
filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
},
{ {
filed_label: 'Tgl. Pengembalian', filed_label: 'Tgl. Pengembalian',
filter_column: 'refund__refund_date', filter_column: 'refund__refund_date',