From abdb5b790cd566f8caa4e2c17577d2c221bb8ce9 Mon Sep 17 00:00:00 2001 From: nikolay Date: Thu, 22 Jun 2023 12:32:02 +0400 Subject: [PATCH] =?UTF-8?q?dev=20#14562=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=D1=8C=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20iOS=20WPA:=20remove=20back=20arrow=20on=20ios=20on=20g?= =?UTF-8?q?uest=20card?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/navbar/navbar.component.html | 4 ++- .../components/navbar/navbar.component.ts | 6 ++-- .../guest-card/guest-card.component.html | 2 +- .../pages/guest-card/guest-card.component.ts | 5 +-- .../pages/login/login.component.html | 2 +- .../pages/login/login.component.ts | 14 ++++---- .../loyality-program.component.html | 2 +- .../loyality-program.component.ts | 32 +++++++++---------- 8 files changed, 36 insertions(+), 31 deletions(-) diff --git a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html index 407d385..733ee6b 100644 --- a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html +++ b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html @@ -1,5 +1,7 @@
- +
+ +

{{title}}

diff --git a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts index 14e3362..3441fef 100644 --- a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts +++ b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts @@ -14,7 +14,7 @@ import { Router } from '@angular/router'; }) export class NavbarComponent implements OnInit { @Input() title: string = 'Название не задано' - @Output() backEvent = new EventEmitter(); + @Input() backEvent?: () => void; showMenu: boolean = false; showDropdown: boolean = false; @@ -55,7 +55,9 @@ export class NavbarComponent implements OnInit { } back() { - this.backEvent.emit(null) + if (this.backEvent) { + this.backEvent(); + } } addToWallet = () => { diff --git a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.html b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.html index 03d0f89..17bfaa8 100644 --- a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.html +++ b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.html @@ -1,4 +1,4 @@ - +
diff --git a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.ts b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.ts index 38fb195..91c7f7d 100644 --- a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.ts +++ b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.ts @@ -6,11 +6,10 @@ import { ExitComponent } from 'src/app/components/exit/exit.component'; import { CookiesService } from 'src/app/services/cookies.service'; import { WpJsonService } from 'src/app/services/wp-json.service'; import { environment } from 'src/environments/environment'; -import moment from 'moment'; -import { Moment, Purchase } from 'src/app/interface/data'; import { LoyaltyProgramService } from 'src/app/services/loyalty-program.service'; import { MessageService } from 'primeng/api'; import { MessagingService } from 'src/app/services/messaging.service'; +import { DeviceType, getTypeDevice } from 'src/app/utils'; @Component({ selector: 'app-guest-card', @@ -22,6 +21,7 @@ export class GuestCardComponent implements OnInit { private isQrCodeClicked: boolean = false; public customerInfo!: any; public Math: Math = Math; + public showBack: boolean = false; constructor( private _bottomSheet: MatBottomSheet, @@ -34,6 +34,7 @@ export class GuestCardComponent implements OnInit { ) { } ngOnInit(): void { + this.showBack = getTypeDevice() === DeviceType.android; const token = this.cookiesService.getItem('token'); this.requestPermission(); diff --git a/angular/src/app/presentation-options/default-option/pages/login/login.component.html b/angular/src/app/presentation-options/default-option/pages/login/login.component.html index 7e9d447..182dd84 100644 --- a/angular/src/app/presentation-options/default-option/pages/login/login.component.html +++ b/angular/src/app/presentation-options/default-option/pages/login/login.component.html @@ -1,7 +1,7 @@ +
diff --git a/angular/src/app/presentation-options/default-option/pages/loyality-program/loyality-program.component.ts b/angular/src/app/presentation-options/default-option/pages/loyality-program/loyality-program.component.ts index be71ac8..da1dd10 100644 --- a/angular/src/app/presentation-options/default-option/pages/loyality-program/loyality-program.component.ts +++ b/angular/src/app/presentation-options/default-option/pages/loyality-program/loyality-program.component.ts @@ -9,21 +9,21 @@ import { LoyaltyProgramService } from 'src/app/services/loyalty-program.service' templateUrl: './loyality-program.component.html', styleUrls: ['./loyality-program.component.scss'], }) -export class LoyalityProgramComponent implements OnInit { - constructor( - private _location: Location, - public loyaltyProgram: LoyaltyProgramService, - ) {} - - public lvlPeriods: lvlPeriod[] = lvlPeriods; - - goBack() { - this._location.back(); - } +export class LoyalityProgramComponent implements OnInit { + constructor( + private _location: Location, + public loyaltyProgram: LoyaltyProgramService, + ) { } - ngOnInit(): void { - if(this.loyaltyProgram.currentLvlPeriod == null) { - this._location.back(); - } - } + public lvlPeriods: lvlPeriod[] = lvlPeriods; + + goBack = () => { + this._location.back(); + } + + ngOnInit(): void { + if (this.loyaltyProgram.currentLvlPeriod == null) { + this._location.back(); + } + } }