From 1960c6a7d374bec75585a1e1e350e8fbb8ead1ad Mon Sep 17 00:00:00 2001 From: gofnnp Date: Mon, 6 Feb 2023 00:48:16 +0400 Subject: [PATCH] =?UTF-8?q?dev=20#13306=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20?= =?UTF-8?q?=D0=BE=D1=82=D1=81=D1=83=D1=82=D1=81=D1=82=D0=B2=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BD=D0=BE=D0=BC=D0=B5=D1=80=D0=B0=20=D1=82=D0=B5=D0=BB=D0=B5?= =?UTF-8?q?=D1=84=D0=BE=D0=BD=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=BA=D0=B0=D0=B7=D0=B5,=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D1=8C=20?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B7=D0=B0=D0=BA=D0=B0?= =?UTF-8?q?=D0=B7=D0=B0,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B0=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82=D0=B8=D1=87=D0=B5?= =?UTF-8?q?=D1=81=D0=BA=D1=83=D1=8E=20=D1=81=D0=BC=D0=B5=D0=BD=D1=83=20?= =?UTF-8?q?=D0=B4=D0=B0=D1=82=D1=8B=20=D0=B2=D1=8B=D0=B4=D0=B0=D1=87=D0=B8?= =?UTF-8?q?=20=D1=80=D0=B0=D0=B7=20=D0=B2=20=D0=BC=D0=B8=D0=BD=D1=83=D1=82?= =?UTF-8?q?=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user-data-order.component.ts | 17 ++++++++++++++--- angular/src/app/models/order.ts | 4 ++-- angular/src/app/pages/cart/cart.component.html | 1 + angular/src/app/pages/cart/cart.component.ts | 4 ++++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/angular/src/app/components/user-data-order/user-data-order.component.ts b/angular/src/app/components/user-data-order/user-data-order.component.ts index 5aac8f7..722078d 100644 --- a/angular/src/app/components/user-data-order/user-data-order.component.ts +++ b/angular/src/app/components/user-data-order/user-data-order.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { DeliveryData, DeliveryType, PaymentMethod, UserData } from 'src/app/interface/data'; import { paymentMethods } from "../../app.constants"; @@ -24,7 +24,7 @@ import { lastValueFrom } from 'rxjs'; templateUrl: './user-data-order.component.html', styleUrls: ['./user-data-order.component.scss'] }) -export class UserDataOrderComponent implements OnInit { +export class UserDataOrderComponent implements OnInit, OnDestroy { @Output() orderSubmitted = new EventEmitter(); readonly cities = environment.cities; @@ -40,6 +40,7 @@ export class UserDataOrderComponent implements OnInit { public showMyMessage: boolean = false; public order!: Order; public showAuthoriztion = false; + private intervalTimeDelivery!: any public userData: UserData = { first_name: null, @@ -87,6 +88,11 @@ export class UserDataOrderComponent implements OnInit { } }) this.deliverData.deliveryDate = moment().add(this.checkoutConfig?.timeDelivery?.changeTime?.defaultValue || 0, 'minutes').toDate() + this.intervalTimeDelivery = setInterval(() => { + this.mainFormGroup.controls['deliveryDataForm'].patchValue({ + deliveryDate: moment().add(this.checkoutConfig?.timeDelivery?.changeTime?.defaultValue || 0, 'minutes').toDate() + }) + }, 60_000) this.paymentMethods = this.checkoutConfig.payments.values this.deliverData.paymentMethod = this.paymentMethods[this.checkoutConfig.payments.default] @@ -115,6 +121,7 @@ export class UserDataOrderComponent implements OnInit { } phoneConfirmed() { + this._createMainForm(); this.showAuthoriztion = false this.checkAuthorization(true) } @@ -203,7 +210,7 @@ export class UserDataOrderComponent implements OnInit { this.loading = false; } catch (e) { - console.error('Erroe: ', e); + console.error('Error: ', e); this.messageService.add({ severity: 'error', @@ -241,5 +248,9 @@ export class UserDataOrderComponent implements OnInit { comment: [this.deliverData.comment, [Validators.maxLength(255),]] }); } + + ngOnDestroy(): void { + clearInterval(this.intervalTimeDelivery) + } } diff --git a/angular/src/app/models/order.ts b/angular/src/app/models/order.ts index da6b789..d9b86b7 100644 --- a/angular/src/app/models/order.ts +++ b/angular/src/app/models/order.ts @@ -44,7 +44,7 @@ export class Order { paymentsystem: this.deliveryData?.paymentMethod?.type, phone: this.phone, persons: 1, - name: "31", + name: this.userData?.first_name, payment: { delivery_price: 100, products: this.products.map(product => { @@ -54,7 +54,7 @@ export class Order { subtotal: this.price, 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}`, + delivery_address: this.deliveryData?.deliveryType?.type === "self_delivery" ? '' : `${environment.cities[0]}, ул ${this.userData?.street}, ${this.userData?.house}`, amount: this.price + 100, terminal_id: this.terminal_id }, diff --git a/angular/src/app/pages/cart/cart.component.html b/angular/src/app/pages/cart/cart.component.html index 49a16e7..6f9c9d7 100644 --- a/angular/src/app/pages/cart/cart.component.html +++ b/angular/src/app/pages/cart/cart.component.html @@ -3,6 +3,7 @@ [fullScreen]="isFullScreen" [baseZIndex]="10000" position="right" + (onHide)="hide()" >