dev #15189 фикс мерджа

angular/src/app/directives/download-app.directive.ts

@@ -7,27 +7,57 @@ import {
 } from '@angular/core';
 
 import { MessageService } from 'primeng/api';
-import { AppComponent } from '../app.component';
+import { getTypeDevice, pwaInstalled } from 'src/app/utils';
 
 @Directive({
   selector: '[appDownloadApp]',
 })
 export class DownloadAppDirective implements OnInit {
+  public deviceType: 'ios' | 'android' | null = null;
+  public deferredPrompt: any;
+
   constructor(
     private messageService: MessageService,
     public renderer: Renderer2,
-    private el: ElementRef
+    private el: ElementRef,
   ) { }
 
   ngOnInit(): void {
-    if (AppComponent.pwaInstalled) {
+    getTypeDevice();
+    if (this.deviceType === 'ios') {
+      this.el.nativeElement.style.display = 'block';
+    }
+    this.checkInstalled();
+  }
+
+  async checkInstalled(): Promise<void> {
+    if (window.matchMedia('(display-mode: standalone)').matches
+      || await pwaInstalled()) {
       this.el.nativeElement.style.display = 'none';
     }
   }
 
+  @HostListener('window:beforeinstallprompt', ['$event'])
+  onBeforeInstallPrompt(e: any) {
+    e.preventDefault();
+    this.deferredPrompt = e;
+    if (this.deferredPrompt) {
+      this.el.nativeElement.style.display = 'block';
+    }
+  }
+
+  @HostListener('window:appinstalled', ['$event'])
+  onAppInstalled(e: any) {
+    // Prevent Chrome 67 and earlier from automatically showing the prompt
+    e.preventDefault();
+    // Stash the event so it can be triggered later.
+    this.deferredPrompt = e;
+    this.el.nativeElement.style.display = 'none';
+  }
+
   @HostListener('click', ['$event'])
   async downloadApp(event: MouseEvent) {
-    if (!AppComponent.pwaPrompt) {
+    if (!this.deferredPrompt) {
       this.messageService.clear();
       this.messageService.add({
         severity: 'error',
@@ -35,8 +65,8 @@ export class DownloadAppDirective implements OnInit {
       });
       return;
     }
-    AppComponent.pwaPrompt.prompt();
+    this.deferredPrompt.prompt();
-    AppComponent.pwaPrompt.userChoice.then((res: any) => {
+    this.deferredPrompt.userChoice.then((res: any) => {
       if (res.outcome === 'accepted') {
         this.messageService.clear();
         this.messageService.add({
@@ -44,7 +74,8 @@ export class DownloadAppDirective implements OnInit {
           summary: 'Спасибо за установку!',
         });
       }
-      AppComponent.pwaPrompt = null;
+      this.deferredPrompt = null;
     });
   }
+
 }

angular/src/app/presentation-options/default-option/components/last-order/last-order.component.html

@@ -1,19 +1,23 @@
-<div class="info-order">
-  <ng-container *ngIf="lastOrder">
 <h2>Ваш предыдущий заказ</h2>
+<div class="info-order">
   <p class="flex"><span>Дата: </span>
-      <span class="info" *ngIf="!loading">{{lastOrder!.last_purchase_date}}</span>    
+    <span *ngIf="!loading">{{(lastOrder?.transactionCreateDate | date:'dd.MM.yyyyг.') || 'Данные не найдены'}}</span>
+    <ng-container *ngIf="loading">
+      <ng-container
+        *ngTemplateOutlet="spinner; context: { $implicit: 24 }"
+      ></ng-container>
+    </ng-container>
   </p>
   <p class="flex"><span>На сумму: </span>
-      <span class="info" *ngIf="!loading">{{lastOrder?.last_purchase_sum}}₽</span>    
+    <span *ngIf="!loading">{{lastOrder?.orderSum ? lastOrder?.orderSum + ' ₽' : 'Данные не найдены'}}</span>
-    </p>
+    <ng-container *ngIf="loading">
+      <ng-container
+        *ngTemplateOutlet="spinner; context: { $implicit: 24 }"
+      ></ng-container>
     </ng-container>
-  <ng-container *ngIf="!lastOrder">
-    <p class="flex">
-      <span>Покупок за последние пол года не было</span>
   </p>
-  </ng-container>
 </div>
+<img src="./assets/970х250_3.png" alt="" width="100%" />
 <a href="https://yandex.ru/profile/151770398186" target="_blank">
   <button class="evaluate-order">Оценить заказ</button>
 </a>

angular/src/app/presentation-options/default-option/components/last-order/last-order.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { LastPurchase } from 'src/app/interface/data';
+import { Purchase } from 'src/app/interface/data';
 
 @Component({
   selector: 'app-last-order[lastOrder]',
@@ -7,11 +7,12 @@ import { LastPurchase } from 'src/app/interface/data';
   styleUrls: ['./last-order.component.scss']
 })
 export class LastOrderComponent implements OnInit {
-  @Input() lastOrder?: LastPurchase;
+  @Input() lastOrder?: Purchase;
   @Input() loading!: boolean;
 
   constructor() { }
 
   ngOnInit(): void {
   }
+
 }

angular/src/app/presentation-options/default-option/pages/loyality-program/loyality-program.component.html

@@ -4,12 +4,12 @@
 <div class="loyality-program">
 <app-accordion header="Условия начисления бонусов">
   <p>
-	Ваш текущий уровень {{ authService.userInfo?.current_level_and_cashback?.current_level ?? '--' }},
+    Ваш текущий уровень {{ authService.userInfo?.customer_level }},
     поэтому вам начисляется {{ authService.currentLvlPeriod.percent }}% от суммы покупки. 
   </p>
   <p>
     Смена уровня произойдет в начале следующего квартала,
-	{{ authService.currentPeriod[1]
+    {{ authService.purchaseData.currentPeriod[1]
               .locale("ru")
               .format("DD.MM.YY") }}.
   </p>