Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development

src/modules/item-related/item/domain/usecases/managers/index-item.manager.ts

@@ -121,6 +121,16 @@ export class IndexItemManager extends BaseIndexManager<ItemEntity> {
       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;
   }
 }

src/modules/queue/data/services/ticket.service.ts

@@ -40,11 +40,14 @@ export class TicketDataService extends BaseDataService<QueueTicket> {
   }
 
   async loginQueue(id: string): Promise<QueueOrder> {
+    const start = moment().startOf('day').valueOf();
+    const end = moment().endOf('day').valueOf();
+
     const order = await this.order.findOne({
       relations: ['tickets'],
       where: [
-        { transaction_id: id },
-        { code: id, transaction_id: Not(IsNull()) },
+        { transaction_id: id, date: Between(start, end) },
+        { code: id, transaction_id: Not(IsNull()), date: Between(start, end) },
       ],
     });