Compare commits

...

8 Commits

6 changed files with 29 additions and 2 deletions

View File

@ -48,7 +48,7 @@ export class OtpCheckerGuard implements CanActivate {
}); });
} }
console.log({ dataIdentity, otpCode, otpData }); // console.log({ dataIdentity, otpCode, otpData });
if (otpData && otpData?.verified_at) return true; if (otpData && otpData?.verified_at) return true;
} }

View File

@ -43,7 +43,7 @@ export class BookingItemManager extends IndexItemManager {
const hasRates = (this.filterParam.season_period_ids?.length ?? 0) > 0; const hasRates = (this.filterParam.season_period_ids?.length ?? 0) > 0;
const items = data.map((item) => { const items = data.map((item) => {
const currentRate = item.item_rates.find((rate) => const currentRate = item.item_rates.find((rate) =>
this.filterParam.season_period_ids.includes(rate.season_period_id), this.filterParam.season_period_ids?.includes(rate.season_period_id),
); );
const { item_rates, ...rest } = item; const { item_rates, ...rest } = item;
const rate = currentRate?.['price'] ?? rest.base_price; const rate = currentRate?.['price'] ?? rest.base_price;
@ -54,4 +54,14 @@ export class BookingItemManager extends IndexItemManager {
}); });
return { total, data: items }; return { total, data: items };
} }
setQueryFilter(
queryBuilder: SelectQueryBuilder<ItemEntity>,
): SelectQueryBuilder<ItemEntity> {
const query = super.setQueryFilter(queryBuilder);
query.andWhere(`${this.tableName}.status = 'active'`);
return query;
}
} }

View File

@ -23,6 +23,7 @@ export class ItemController {
): Promise<PaginationResponse<ItemEntity>> { ): Promise<PaginationResponse<ItemEntity>> {
params.limit = 1000; params.limit = 1000;
params.show_to_booking = true; params.show_to_booking = true;
params.all_item = true;
this.indexManager.setFilterParam(params); this.indexManager.setFilterParam(params);
this.indexManager.setService(this.serviceData, TABLE_NAME.ITEM); this.indexManager.setService(this.serviceData, TABLE_NAME.ITEM);
await this.indexManager.execute(); await this.indexManager.execute();

View File

@ -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',
]; ];
} }

View File

@ -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',
]; ];
} }

View File

@ -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,