Compare commits
No commits in common. "033ed0046e61b8503f7e0aec6ee04e4a8f690ddf" and "4e2ec4d94f31fdf3a64df31df975df46243dcbe3" have entirely different histories.
033ed0046e
...
4e2ec4d94f
|
@ -121,16 +121,6 @@ export class IndexItemManager extends BaseIndexManager<ItemEntity> {
|
||||||
queryBuilder.andWhere(`${this.tableName}.show_to_booking = true`);
|
queryBuilder.andWhere(`${this.tableName}.show_to_booking = true`);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.filterParam.without_time_group != null) {
|
|
||||||
const withoutTimeGroup = this.filterParam.without_time_group
|
|
||||||
? 'Is Null'
|
|
||||||
: 'Is Not Null';
|
|
||||||
|
|
||||||
queryBuilder.andWhere(
|
|
||||||
`${this.tableName}.time_group_id ${withoutTimeGroup}`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return queryBuilder;
|
return queryBuilder;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,14 +40,11 @@ export class TicketDataService extends BaseDataService<QueueTicket> {
|
||||||
}
|
}
|
||||||
|
|
||||||
async loginQueue(id: string): Promise<QueueOrder> {
|
async loginQueue(id: string): Promise<QueueOrder> {
|
||||||
const start = moment().startOf('day').valueOf();
|
|
||||||
const end = moment().endOf('day').valueOf();
|
|
||||||
|
|
||||||
const order = await this.order.findOne({
|
const order = await this.order.findOne({
|
||||||
relations: ['tickets'],
|
relations: ['tickets'],
|
||||||
where: [
|
where: [
|
||||||
{ transaction_id: id, date: Between(start, end) },
|
{ transaction_id: id },
|
||||||
{ code: id, transaction_id: Not(IsNull()), date: Between(start, end) },
|
{ code: id, transaction_id: Not(IsNull()) },
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue