Merge pull request 'feat(SPG-1137): add time group at booking and refund detail' (#161) from feat/otp-cancel into development
Reviewed-on: #161pull/142/head 1.6.23-alpha.3
commit
13b5838393
|
@ -31,6 +31,10 @@ export class DetailRefundManager extends BaseDetailManager<RefundEntity> {
|
||||||
'items.bundling_items',
|
'items.bundling_items',
|
||||||
'items.refunds item_refunds',
|
'items.refunds item_refunds',
|
||||||
'item_refunds.refund item_refunds_refund',
|
'item_refunds.refund item_refunds_refund',
|
||||||
|
|
||||||
|
'transaction.items transaction_items',
|
||||||
|
'transaction_items.item transaction_items_item',
|
||||||
|
'transaction_items_item.time_group transaction_items_item_time_group',
|
||||||
],
|
],
|
||||||
|
|
||||||
// relation yang hanya ingin dihitung (akan return number)
|
// relation yang hanya ingin dihitung (akan return number)
|
||||||
|
@ -65,6 +69,10 @@ export class DetailRefundManager extends BaseDetailManager<RefundEntity> {
|
||||||
'item_refunds',
|
'item_refunds',
|
||||||
'item_refunds_refund.id',
|
'item_refunds_refund.id',
|
||||||
'item_refunds_refund.status',
|
'item_refunds_refund.status',
|
||||||
|
|
||||||
|
'transaction_items',
|
||||||
|
'transaction_items_item',
|
||||||
|
'transaction_items_item_time_group',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,9 @@ export class DetailTransactionManager extends BaseDetailManager<TransactionEntit
|
||||||
'items.refunds item_refunds',
|
'items.refunds item_refunds',
|
||||||
'item_refunds.refund item_refunds_refund',
|
'item_refunds.refund item_refunds_refund',
|
||||||
'refunds',
|
'refunds',
|
||||||
|
|
||||||
|
'items.item items_item',
|
||||||
|
'items_item.time_group items_item_time_group',
|
||||||
],
|
],
|
||||||
|
|
||||||
// relation yang hanya ingin dihitung (akan return number)
|
// relation yang hanya ingin dihitung (akan return number)
|
||||||
|
@ -92,6 +95,8 @@ export class DetailTransactionManager extends BaseDetailManager<TransactionEntit
|
||||||
'item_refunds_refund.status',
|
'item_refunds_refund.status',
|
||||||
|
|
||||||
'refunds',
|
'refunds',
|
||||||
|
'items_item',
|
||||||
|
'items_item_time_group',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -43,6 +43,8 @@ export function mappingTransaction(data, refundId?: string) {
|
||||||
if (refundId)
|
if (refundId)
|
||||||
refund = itemData.refunds?.find((item) => item.refund.id == refundId);
|
refund = itemData.refunds?.find((item) => item.refund.id == refundId);
|
||||||
|
|
||||||
|
const timeGroup = itemData?.item?.time_group;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
item: {
|
item: {
|
||||||
id: itemData.item_id,
|
id: itemData.item_id,
|
||||||
|
@ -57,6 +59,7 @@ export function mappingTransaction(data, refundId?: string) {
|
||||||
},
|
},
|
||||||
breakdown_bundling: itemData.breakdown_bundling,
|
breakdown_bundling: itemData.breakdown_bundling,
|
||||||
bundling_items: itemData.bundling_items,
|
bundling_items: itemData.bundling_items,
|
||||||
|
time_group: timeGroup,
|
||||||
},
|
},
|
||||||
id: itemData.id,
|
id: itemData.id,
|
||||||
refund: refund,
|
refund: refund,
|
||||||
|
|
Loading…
Reference in New Issue