diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 5753555..d444633 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -23,6 +23,8 @@ import { MenuComponent } from './components/menu/menu.component';
import { ExitComponentComponent } from './components/exit-component/exit-component.component';
import { TableModule } from 'primeng/table';
import { ScrollPanelModule } from 'primeng/scrollpanel';
+import { ToastModule } from 'primeng/toast';
+
const routes = [
@@ -58,6 +60,7 @@ const routes = [
MatSidenavModule,
FormsModule,
ReactiveFormsModule,
+ ToastModule,
MessagesModule,
TableModule,
ScrollPanelModule,
diff --git a/src/app/pages/orders/orders.component.html b/src/app/pages/orders/orders.component.html
index 4cb3927..c34bcc4 100644
--- a/src/app/pages/orders/orders.component.html
+++ b/src/app/pages/orders/orders.component.html
@@ -150,12 +150,15 @@
| {{sumRef}} |
- |
+
+ |
+
+
diff --git a/src/app/pages/orders/orders.component.scss b/src/app/pages/orders/orders.component.scss
index 065b532..0f65418 100644
--- a/src/app/pages/orders/orders.component.scss
+++ b/src/app/pages/orders/orders.component.scss
@@ -48,3 +48,4 @@ tr {
width: calc(100% - 5px);
table-layout: fixed;
}
+
diff --git a/src/app/pages/orders/orders.component.ts b/src/app/pages/orders/orders.component.ts
index 5e8dbba..9887b52 100644
--- a/src/app/pages/orders/orders.component.ts
+++ b/src/app/pages/orders/orders.component.ts
@@ -4,6 +4,7 @@ import { JsonrpcService, RpcService } from "src/app/services/jsonrpc.service";
import { MessageService } from "primeng/api";
import { Order, Products, Delivery_address, Notification, Refund } from "src/app/interface/data";
import { ClientsComponent } from "../clients/clients.component";
+import { ToastModule } from 'primeng/toast';
/*import { SwPush, NewsletterService } from '@angular/service-worker*/
@@ -118,7 +119,7 @@ export class OrdersComponent implements OnInit {
document.getElementsByTagName('thead')[0].style.width = '100%';
document.getElementsByTagName('thead')[0].style.tableLayout = 'fixed';
document.getElementsByTagName('tbody')[0].style.display = 'block';
- document.getElementsByTagName('tbody')[0].style.maxHeight = 'calc(100vh - 290px)';
+ document.getElementsByTagName('tbody')[0].style.maxHeight = 'calc(100vh - 385px)';
document.getElementsByTagName('tbody')[0].style.overflowY = 'scroll';
},
error: (err) => {
@@ -131,8 +132,7 @@ export class OrdersComponent implements OnInit {
}
);
}
- setTimeout (() => this.notif2(), 700)
-
+ setTimeout(() => this.notif2(), 700)
}
@@ -146,13 +146,25 @@ notif2() {
this.myAudioP.load();
this.myAudioP.play();
this.map_new_fin.set(this.orders[i].id, true);
+ this.messageService.add({
+ severity: 'info',
+ detail: 'Пришел новый заказ №' + this.orders[i].external_id,
+ summary: 'Новый заказ!',
+ key: 'br', sticky: true
+ })
}
var date1 = new Date();
var date2 = new Date(this.orders[i].due_datetime);
- if ((date2.getTime() - date1.getTime() < 1000 * 3600) && (this.orders[i].status_h == 'К готовке') && (this.map_due.has(this.orders[i].id) == false) && (date2.getTime() - date1.getTime() > 1000 * 1080)) {
+ if ((date2.getTime() - date1.getTime() < 1000 * 3600) && (this.orders[i].status_h == 'К готовке') && (this.map_due.has(this.orders[i].id) == false) && (date2.getTime() - date1.getTime() > 1000 * 3000)) {
this.myAudioA.load();
this.myAudioA.play();
this.map_due.set(this.orders[i].id, true);
+ this.messageService.add({
+ severity: 'warn',
+ detail: 'По заказу ' + this.orders[i].external_id + ' до прихода покупателя остался 1 час!',
+ summary: 'Не взят в работу!',
+ key: 'br', sticky: true
+ })
}
}
}
@@ -233,7 +245,6 @@ notif2() {
.subscribe({
next: (result) => {
let data = result.result
- console.log(data)
},
error: (err) => {
console.log('ERROR: ', err)
@@ -244,7 +255,6 @@ notif2() {
}
}
);
- console.log(id, qr_id)
}
diff --git a/src/assets/myAudio.mp3 b/src/assets/myAudio.mp3
index fa82a40..ce144a1 100644
Binary files a/src/assets/myAudio.mp3 and b/src/assets/myAudio.mp3 differ
diff --git a/src/assets/myAudio2.mp3 b/src/assets/myAudio2.mp3
index f39aec8..a68a453 100644
Binary files a/src/assets/myAudio2.mp3 and b/src/assets/myAudio2.mp3 differ