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

feat(SPG-1133): penambahan kolom dan filter time group di report income per item dan report income per item master

pull/143/head
Firman Ramdhani 2025-05-28 18:26:52 +07:00
parent 9e5d59baac
commit 845e0547ab
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ export default <ReportConfigEntity>{
LEFT JOIN refunds refund ON refund.transaction_id = main.id LEFT JOIN refunds refund ON refund.transaction_id = main.id
LEFT JOIN refund_items refund_item ON refund_item.refund_item_id = tr_item.item_id::uuid LEFT JOIN refund_items refund_item ON refund_item.refund_item_id = tr_item.item_id::uuid
LEFT JOIN items item ON item.id::text = tr_item.item_id::text LEFT JOIN items item ON item.id::text = tr_item.item_id::text
LEFT JOIN time_groups tg on tg.id = item.time_group_id
LEFT JOIN users tenant ON tenant.id::text = item.tenant_id::text`, LEFT JOIN users tenant ON tenant.id::text = item.tenant_id::text`,
main_table_alias: 'main', main_table_alias: 'main',
whereDefaultConditions: [ whereDefaultConditions: [
@ -111,6 +112,13 @@ export default <ReportConfigEntity>{
type: DATA_TYPE.DIMENSION, type: DATA_TYPE.DIMENSION,
format: DATA_FORMAT.TEXT, format: DATA_FORMAT.TEXT,
}, },
{
column: 'tg__name',
query: 'tg.name',
label: 'Time Group',
type: DATA_TYPE.DIMENSION,
format: DATA_FORMAT.TEXT,
},
{ {
column: 'tr_item__item_name', 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`, query: `CASE WHEN tr_item.item_type = 'bundling' THEN tr_item_bundling.item_name ELSE tr_item.item_name END`,
@ -338,6 +346,12 @@ 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: 'Time Group',
filter_column: 'tg__name',
field_type: FILTER_FIELD_TYPE.input_tag,
filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
},
{ {
filed_label: 'Tipe Pelanggan', filed_label: 'Tipe Pelanggan',
filter_column: 'main__customer_type', filter_column: 'main__customer_type',

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

@ -18,6 +18,7 @@ export default <ReportConfigEntity>{
LEFT JOIN refunds refund ON refund.transaction_id = main.id LEFT JOIN refunds refund ON refund.transaction_id = main.id
LEFT JOIN refund_items refund_item ON refund_item.refund_item_id = tr_item.item_id::uuid LEFT JOIN refund_items refund_item ON refund_item.refund_item_id = tr_item.item_id::uuid
LEFT JOIN items item ON item.id::text = tr_item.item_id::text LEFT JOIN items item ON item.id::text = tr_item.item_id::text
LEFT JOIN time_groups tg on tg.id = item.time_group_id
LEFT JOIN users tenant ON tenant.id::text = item.tenant_id::text`, LEFT JOIN users tenant ON tenant.id::text = item.tenant_id::text`,
main_table_alias: 'main', main_table_alias: 'main',
whereDefaultConditions: [ whereDefaultConditions: [
@ -109,6 +110,13 @@ export default <ReportConfigEntity>{
type: DATA_TYPE.DIMENSION, type: DATA_TYPE.DIMENSION,
format: DATA_FORMAT.TEXT, format: DATA_FORMAT.TEXT,
}, },
{
column: 'tg__name',
query: 'tg.name',
label: 'Time Group',
type: DATA_TYPE.DIMENSION,
format: DATA_FORMAT.TEXT,
},
{ {
column: 'main__customer_type', column: 'main__customer_type',
query: 'main.customer_type', query: 'main.customer_type',
@ -296,6 +304,12 @@ 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: 'Time Group',
filter_column: 'tg__name',
field_type: FILTER_FIELD_TYPE.input_tag,
filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
},
{ {
filed_label: 'Tipe Pelanggan', filed_label: 'Tipe Pelanggan',
filter_column: 'main__customer_type', filter_column: 'main__customer_type',