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 @@ +
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: 'Заказ создан', - }); }, }) );