Merge pull request 'development' (#129) from development into production
Reviewed-on: #129production 1.4.5-production.1
commit
a8b3f67d1b
|
@ -73,13 +73,14 @@ export class LoginAdminQueueManager extends BaseCustomManager<UserEntity> {
|
|||
message: `Akun anda sudah login di item "${hasLoginAsQueue?.item_name}"`,
|
||||
error: 'Unauthorized',
|
||||
});
|
||||
} else if (itemLogin && itemLogin.user_id !== this.userLogin.id) {
|
||||
throw new UnauthorizedException({
|
||||
statusCode: HttpStatus.UNAUTHORIZED,
|
||||
message: `"${userLoginItem.name}" masih login sebagai admin antrian `,
|
||||
error: 'Unauthorized',
|
||||
});
|
||||
}
|
||||
// else if (itemLogin && itemLogin.user_id !== this.userLogin.id) {
|
||||
// throw new UnauthorizedException({
|
||||
// statusCode: HttpStatus.UNAUTHORIZED,
|
||||
// message: `"${userLoginItem.name}" masih login sebagai admin antrian `,
|
||||
// error: 'Unauthorized',
|
||||
// });
|
||||
// }
|
||||
|
||||
// * Disini untuk isi token
|
||||
const tokenData = {
|
||||
|
|
|
@ -144,6 +144,7 @@ export class GenerateQueueManager {
|
|||
qty: data.qty,
|
||||
item_id: queue.id,
|
||||
vip: isVip,
|
||||
showTime: false,
|
||||
};
|
||||
const registerQueueManager = new RegisterQueueManager(
|
||||
this.bucketService,
|
||||
|
|
|
@ -43,6 +43,7 @@ export class RegisterQueueManager extends BaseCreateManager<QueueModel> {
|
|||
|
||||
async beforeProcess(): Promise<void> {
|
||||
const vip = this.data.vip ?? false;
|
||||
const showTime = this.data.showTime ?? true;
|
||||
const item = await this.getItemMaster();
|
||||
this.currentItemMaster = item;
|
||||
const [, end] = await this.queueTime(item.item_queue_id);
|
||||
|
@ -56,7 +57,7 @@ export class RegisterQueueManager extends BaseCreateManager<QueueModel> {
|
|||
|
||||
Object.assign(this.data, {
|
||||
status: STATUS.WAITING,
|
||||
time: end,
|
||||
time: showTime ? end : undefined,
|
||||
item_queue_id: item.item_queue_id,
|
||||
vip,
|
||||
code,
|
||||
|
|
Loading…
Reference in New Issue