From e7a389b484de4d9a8471564395552178495e2bd1 Mon Sep 17 00:00:00 2001
From: gofnnp <fbicha1234@gmail.com>
Date: Tue, 24 Jan 2023 16:06:35 +0400
Subject: [PATCH] =?UTF-8?q?dev=20#13306=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 angular/src/app/app.component.html           | 1 +
 angular/src/app/models/order.ts              | 5 ++++-
 angular/src/app/pages/cart/cart.component.ts | 3 ++-
 angular/src/app/services/order.service.ts    | 4 ----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/angular/src/app/app.component.html b/angular/src/app/app.component.html
index 6ce22ed..2dcb54c 100644
--- a/angular/src/app/app.component.html
+++ b/angular/src/app/app.component.html
@@ -1,4 +1,5 @@
 <app-navbar></app-navbar>
+<p-toast position="top-center"></p-toast>
 <div class="layout">
     <router-outlet></router-outlet>
 </div>
diff --git a/angular/src/app/models/order.ts b/angular/src/app/models/order.ts
index df239dd..da6b789 100644
--- a/angular/src/app/models/order.ts
+++ b/angular/src/app/models/order.ts
@@ -20,6 +20,7 @@ export class Order {
   public deliveryData?: DeliveryData;
   public phone: string;
   public token: string | undefined;
+  public terminal_id: string;
 
   constructor(
     orderInfo: OrderInfo
@@ -29,6 +30,7 @@ export class Order {
     this.deliveryData = orderInfo.deliveryData;
     this.phone = orderInfo.phone;
     this.token = orderInfo.token;
+    this.terminal_id = orderInfo.terminal_id;
   }
 
   get price(): number {
@@ -53,7 +55,8 @@ export class Order {
         delivery_comment: this.deliveryData?.comment,
         delivery: this.deliveryData?.deliveryType?.type,
         delivery_address: this.deliveryData?.deliveryType?.type === "self_delivery" ? null : `${environment.cities[0]}, ул ${this.userData?.street},  ${this.userData?.house}`,
-        amount: this.price + 100
+        amount: this.price + 100,
+        terminal_id: this.terminal_id
      },
     }
   }
diff --git a/angular/src/app/pages/cart/cart.component.ts b/angular/src/app/pages/cart/cart.component.ts
index d909528..c5268bb 100644
--- a/angular/src/app/pages/cart/cart.component.ts
+++ b/angular/src/app/pages/cart/cart.component.ts
@@ -85,7 +85,8 @@ export class CartComponent implements OnInit {
   }
 
   orderSubmitted() {
-    
+    this.visibleSidebar = false
+    this.messageService.add({ severity: 'success', summary: 'Заказ оформлен!' });
   }
 
   confirmClearCart() {
diff --git a/angular/src/app/services/order.service.ts b/angular/src/app/services/order.service.ts
index e226764..525bee2 100644
--- a/angular/src/app/services/order.service.ts
+++ b/angular/src/app/services/order.service.ts
@@ -149,10 +149,6 @@ export class OrderService {
                 true
               )
               .subscribe();
-            this.messageService.add({
-              severity: 'success',
-              summary: 'Заказ создан',
-            });
           },
         })
       );