From 5e69d6e5c576d06da6132da5435bf9a969966d0c Mon Sep 17 00:00:00 2001
From: gofnnp <fbicha1234@gmail.com>
Date: Thu, 12 Jan 2023 01:57:32 +0400
Subject: [PATCH] =?UTF-8?q?dev=20#13538=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B5=D1=81=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83,=20=D0=B2?=
 =?UTF-8?q?=D1=8B=D0=BD=D0=B5=D1=81=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=B0=D0=BB=20=D0=B2=20=D0=B4=D0=B8=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=82=D0=B8=D0=B2=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 angular/package.json                          |   2 +-
 angular/src/app/app.constants.ts              |   2 +-
 angular/src/app/app.module.ts                 |   4 +-
 .../footer-buttons.component.html             |   5 +-
 .../footer-buttons.component.ts               |  22 ---
 .../directives/download-app.directive.spec.ts |   8 +
 .../app/directives/download-app.directive.ts  |  60 ++++++
 .../app/pages/account/account.component.html  |  70 +++++--
 .../app/pages/account/account.component.ts    |   4 +
 .../bonus-program/bonus-program.component.ts  | 181 +++++++++++-------
 .../account/orders/orders.component.html      |   6 +-
 .../pages/account/orders/orders.component.ts  |  28 ++-
 .../ref-system/ref-system.component.ts        |   1 -
 .../account/user-data/user-data.component.ts  |   4 +
 .../src/app/pages/main/main.component.html    |   4 +-
 angular/src/app/pages/main/main.component.ts  |  45 -----
 .../src/assets/menu-icons/download-app.png    | Bin 0 -> 8858 bytes
 17 files changed, 272 insertions(+), 174 deletions(-)
 create mode 100644 angular/src/app/directives/download-app.directive.spec.ts
 create mode 100644 angular/src/app/directives/download-app.directive.ts
 create mode 100644 angular/src/assets/menu-icons/download-app.png

diff --git a/angular/package.json b/angular/package.json
index 99a138c..3f3f911 100644
--- a/angular/package.json
+++ b/angular/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.3",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --host 192.168.0.12",
+    "start": "ng serve --host 192.168.0.14",
     "build": "ng build",
     "watch": "ng build --watch --configuration development",
     "test": "ng test"
diff --git a/angular/src/app/app.constants.ts b/angular/src/app/app.constants.ts
index fec3e2c..5dd5046 100644
--- a/angular/src/app/app.constants.ts
+++ b/angular/src/app/app.constants.ts
@@ -49,7 +49,7 @@ export const PageListWithBonus: Page[] = [
         description: '',
         resName: 'ref-system',
         onSideBar: true,
-    },
+    }
 ];
 
 export const orderStatuses: OrderStatus = {
diff --git a/angular/src/app/app.module.ts b/angular/src/app/app.module.ts
index 0f44a05..716954a 100644
--- a/angular/src/app/app.module.ts
+++ b/angular/src/app/app.module.ts
@@ -33,6 +33,7 @@ import { ShareButtonsModule   } from 'ngx-sharebuttons/buttons';
 import { ShareIconsModule } from 'ngx-sharebuttons/icons';
 import { MessagingService } from './services/messaging.service';
 import { NotFoundComponent } from './pages/not-found/not-found.component';
+import { DownloadAppDirective } from './directives/download-app.directive';
 
 @NgModule({
   declarations: [
@@ -49,7 +50,8 @@ import { NotFoundComponent } from './pages/not-found/not-found.component';
     FooterButtonsComponent,
     UserDataComponent,
     RefSystemComponent,
-    NotFoundComponent
+    NotFoundComponent,
+    DownloadAppDirective
   ],
   imports: [
     BrowserModule,
diff --git a/angular/src/app/components/footer-buttons/footer-buttons.component.html b/angular/src/app/components/footer-buttons/footer-buttons.component.html
index 42f39f5..942bb0d 100644
--- a/angular/src/app/components/footer-buttons/footer-buttons.component.html
+++ b/angular/src/app/components/footer-buttons/footer-buttons.component.html
@@ -1,12 +1,11 @@
 <div class="footer-buttons-container">
-  <!-- *ngIf="deferredPrompt && token?.length" -->
-  <button
+  <!-- <button
     *ngIf="((deviceType == 'android' && deferredPrompt) || deviceType == 'ios') && token?.length"
     class="footer-buttons-container__button download"
     (click)="downloadPWA()"
   >
     <img src="./assets/download.svg" alt="download" />
-  </button>
+  </button> -->
   <button
     *ngIf="!isPermissionNotifications && token?.length"
     class="footer-buttons-container__button"
diff --git a/angular/src/app/components/footer-buttons/footer-buttons.component.ts b/angular/src/app/components/footer-buttons/footer-buttons.component.ts
index 45f8c18..7e0b8af 100644
--- a/angular/src/app/components/footer-buttons/footer-buttons.component.ts
+++ b/angular/src/app/components/footer-buttons/footer-buttons.component.ts
@@ -7,37 +7,15 @@ import { MessageService } from 'primeng/api';
   styleUrls: ['./footer-buttons.component.scss']
 })
 export class FooterButtonsComponent implements OnInit {
-  @Input() deferredPrompt: any;
   @Input() token!: string;
   @Input() isPermissionNotifications!: boolean;
-  @Output() downloadingPWA = new EventEmitter<null>();
   @Output() requestingPermission = new EventEmitter<null>();
   public deviceType: 'ios' | 'android' | null = null;
 
   constructor(
-    private messageService: MessageService,
   ) { }
 
   ngOnInit(): void {
-    this.getTypeDevice()
-  }
-
-  getTypeDevice() {
-    const userAgent = window.navigator.userAgent.toLowerCase()
-    const ios = /iphone|ipod|ipad/.test( userAgent );
-    this.deviceType = ios ? 'ios' : 'android'
-  }
-
-  downloadPWA() {
-    if (this.deviceType === 'ios') {
-      this.messageService.add({
-        severity: 'custom',
-        summary: `Для установки нажмите на кнопку поделиться в Вашем браузере и выберите пункт 'На экран «Домой»'`,
-        sticky: true
-      });
-      return
-    }
-    this.downloadingPWA.emit(null)
   }
 
   requestPermission() {
diff --git a/angular/src/app/directives/download-app.directive.spec.ts b/angular/src/app/directives/download-app.directive.spec.ts
new file mode 100644
index 0000000..e65de2e
--- /dev/null
+++ b/angular/src/app/directives/download-app.directive.spec.ts
@@ -0,0 +1,8 @@
+import { DownloadAppDirective } from './download-app.directive';
+
+describe('DownloadAppDirective', () => {
+  it('should create an instance', () => {
+    const directive = new DownloadAppDirective();
+    expect(directive).toBeTruthy();
+  });
+});
diff --git a/angular/src/app/directives/download-app.directive.ts b/angular/src/app/directives/download-app.directive.ts
new file mode 100644
index 0000000..6b68a21
--- /dev/null
+++ b/angular/src/app/directives/download-app.directive.ts
@@ -0,0 +1,60 @@
+import { Directive, ElementRef, HostListener, OnInit, Renderer2 } from '@angular/core';
+import { MessageService } from 'primeng/api';
+
+@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
+  ) {}
+  ngOnInit(): void {
+    this.getTypeDevice();
+    this.renderer.listen('window', 'beforeinstallprompt', (e) => {
+      e.preventDefault();
+      this.deferredPrompt = e;
+    });
+    this.renderer.listen('window', 'appinstalled', (evt) => {
+      console.log('INSTALLED!!!');
+    });
+    if ((this.deviceType == 'android' && this.deferredPrompt) || this.deviceType == 'ios') {
+      this.el.nativeElement.style.display = 'none'
+    }
+  }
+
+  getTypeDevice() {
+    const userAgent = window.navigator.userAgent.toLowerCase();
+    const ios = /iphone|ipod|ipad/.test(userAgent);
+    this.deviceType = ios ? 'ios' : 'android';
+  }
+
+  @HostListener('click', ['$event'])
+  downloadApp(event: MouseEvent) {
+    if (event) {
+      event.preventDefault();
+    }
+    if (!this.deferredPrompt) {
+      this.messageService.add({
+        severity: 'error',
+        summary: 'Не поддерживается в Вашем браузере!',
+      });
+      return;
+    }
+    this.deferredPrompt.prompt();
+    this.deferredPrompt.userChoice.then((res: any) => {
+      if (res.outcome === 'accepted') {
+        this.messageService.add({
+          severity: 'custom',
+          summary: 'Спасибо за установку!',
+        });
+        console.log('User Accepted!!!');
+      }
+      this.deferredPrompt = null;
+    });
+  }
+}
diff --git a/angular/src/app/pages/account/account.component.html b/angular/src/app/pages/account/account.component.html
index 41806ec..397f82d 100644
--- a/angular/src/app/pages/account/account.component.html
+++ b/angular/src/app/pages/account/account.component.html
@@ -1,11 +1,19 @@
-<div [ngClass]="{
-  woocommerce: true,
-  'auth-page': currentPage.code === PageCode.Auth
-}">
-  <div *ngIf="currentPage.code !== PageCode.Auth" class="top-left-attribute"></div>
+<div
+  [ngClass]="{
+    woocommerce: true,
+    'auth-page': currentPage.code === PageCode.Auth
+  }"
+>
+  <div
+    *ngIf="currentPage.code !== PageCode.Auth"
+    class="top-left-attribute"
+  ></div>
   <div [ngSwitch]="currentPage.code" class="">
     <ng-container *ngSwitchCase="PageCode.Auth">
-      <app-auth [handleHttpError]="handleHttpErrorFunc" (phoneConfirmed)="phoneConfirmed()"></app-auth>
+      <app-auth
+        [handleHttpError]="handleHttpErrorFunc"
+        (phoneConfirmed)="phoneConfirmed()"
+      ></app-auth>
     </ng-container>
     <ng-container *ngSwitchCase="PageCode.Orders">
       <app-orders></app-orders>
@@ -20,15 +28,27 @@
       <app-ref-system></app-ref-system>
     </ng-container>
   </div>
-  <nav *ngIf="currentPage.code !== PageCode.Auth" class="woocommerce-MyAccount-navigation">
+  <nav
+    *ngIf="currentPage.code !== PageCode.Auth"
+    class="woocommerce-MyAccount-navigation"
+  >
     <ul>
       <ng-container *ngFor="let page of pageList; let index = index">
-        <li *ngIf="page.onSideBar" class="woocommerce-MyAccount-navigation-link" [ngClass]="{
+        <li
+          *ngIf="page.onSideBar"
+          class="woocommerce-MyAccount-navigation-link"
+          [ngClass]="{
             'is-active': page === currentPage,
             first: index === 1
-          }" (click)="changePage($event, page)">
+          }"
+          (click)="changePage($event, page)"
+        >
           <div class="container">
-            <img src="{{ './assets/menu-icons/' + page.resName + '.png' }}" alt="Иконка меню" />
+            <img
+              style="width: 36px"
+              src="{{ './assets/menu-icons/' + page.resName + '.png' }}"
+              alt="Иконка меню"
+            />
             <div class="menu-item-info">
               <a href="#">{{ page.name }}</a>
               <p>{{ page.description }}</p>
@@ -36,7 +56,26 @@
           </div>
         </li>
       </ng-container>
-      <li class="woocommerce-MyAccount-navigation-link" (click)="logout($event)">
+      <li
+        class="woocommerce-MyAccount-navigation-link"
+        *appDownloadApp
+      >
+        <div class="container">
+          <img
+            style="width: 36px"
+            src="./assets/menu-icons/download-app.png"
+            alt="Иконка меню"
+          />
+          <div class="menu-item-info">
+            <a href="#">Установить приложение</a>
+            <!-- <p>{{ page.description }}</p> -->
+          </div>
+        </div>
+      </li>
+      <li
+        class="woocommerce-MyAccount-navigation-link"
+        (click)="logout($event)"
+      >
         <div class="container">
           <img src="./assets/menu-icons/exit.png" alt="Иконка меню" />
           <div class="menu-item-info">
@@ -46,9 +85,12 @@
       </li>
     </ul>
   </nav>
-  <span class="version" [ngClass]="{
+  <span
+    class="version"
+    [ngClass]="{
       version: true
-    }">
+    }"
+  >
     v{{ version }}
   </span>
-</div>
\ No newline at end of file
+</div>
diff --git a/angular/src/app/pages/account/account.component.ts b/angular/src/app/pages/account/account.component.ts
index bdd91b9..0978f06 100644
--- a/angular/src/app/pages/account/account.component.ts
+++ b/angular/src/app/pages/account/account.component.ts
@@ -133,6 +133,10 @@ export class AccountComponent implements OnInit {
 
   changePage(event: MouseEvent, page: Page): void {
     event.preventDefault();
+    if (page.resName === 'download-app') {
+      
+      return
+    }
     this.currentPage = page;
     // let params = new HttpParams();
     // params = params.append('activePage', this.currentPage.code);
diff --git a/angular/src/app/pages/account/bonus-program/bonus-program.component.ts b/angular/src/app/pages/account/bonus-program/bonus-program.component.ts
index dca1624..a896451 100644
--- a/angular/src/app/pages/account/bonus-program/bonus-program.component.ts
+++ b/angular/src/app/pages/account/bonus-program/bonus-program.component.ts
@@ -1,7 +1,16 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { lastValueFrom } from 'rxjs';
-import { orderStatuses, PageList, PageListWithBonus } from 'src/app/app.constants';
-import { BonusProgramAccount, Page, Purchase, Transaction } from 'src/app/interface/data';
+import {
+  orderStatuses,
+  PageList,
+  PageListWithBonus,
+} from 'src/app/app.constants';
+import {
+  BonusProgramAccount,
+  Page,
+  Purchase,
+  Transaction,
+} from 'src/app/interface/data';
 import { JsonrpcService, RpcService } from 'src/app/services/jsonrpc.service';
 import * as moment from 'moment-timezone';
 import * as barcode from 'jsbarcode';
@@ -10,20 +19,22 @@ import { AppleWalletService } from 'src/app/services/apple-wallet.service';
 import { CookiesService } from 'src/app/services/cookies.service';
 import { DOCUMENT } from '@angular/common';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { MessageService } from 'primeng/api';
 
 @Component({
   selector: 'app-bonus-program',
   templateUrl: './bonus-program.component.html',
-  styleUrls: ['./bonus-program.component.scss']
+  styleUrls: ['./bonus-program.component.scss'],
 })
 export class BonusProgramComponent implements OnInit {
-
   public accountData!: BonusProgramAccount;
   public purchases: Purchase[] = [];
   public loadingBonuses: boolean = false;
   readonly orderStatuses = orderStatuses;
   readonly moment = moment;
-  readonly pageList = environment.hasBonusProgram ? PageListWithBonus : PageList;
+  readonly pageList = environment.hasBonusProgram
+    ? PageListWithBonus
+    : PageList;
   public currentPage: Page = this.pageList[1];
   public userName: string = '';
   public deviceType: 'ios' | 'android' | null = null;
@@ -34,67 +45,98 @@ export class BonusProgramComponent implements OnInit {
     private cookiesService: CookiesService,
     @Inject(DOCUMENT) private document: Document,
     private http: HttpClient,
-  ) { }
+    private messageService: MessageService,
+  ) {}
 
   ngOnInit(): void {
     this.getAccountData();
-    this.getTypeDevice()
+    this.getTypeDevice();
   }
 
   getTypeDevice() {
-    const userAgent = window.navigator.userAgent.toLowerCase()
-    const ios = /iphone|ipod|ipad/.test( userAgent );
-    this.deviceType = ios ? 'ios' : 'android'
+    const userAgent = window.navigator.userAgent.toLowerCase();
+    const ios = /iphone|ipod|ipad/.test(userAgent);
+    this.deviceType = ios ? 'ios' : 'android';
   }
 
-  async getAccountData(): Promise<void>{
+  async getAccountData(): Promise<void> {
     this.loadingBonuses = true;
 
-    this.jsonrpc.rpc({
-      method: 'getAdditionalInfo',
-      params: []
-    }, RpcService.authService, true).subscribe({
-      next: (res) => {
-        this.userName = res.data.first_name
-      },
-      error: (err) => {
-        console.error('Error: ', err)
-      }
-    });
+    this.jsonrpc
+      .rpc(
+        {
+          method: 'getAdditionalInfo',
+          params: [],
+        },
+        RpcService.authService,
+        true
+      )
+      .subscribe({
+        next: (res) => {
+          this.userName = res?.data?.first_name;
+        },
+        error: (err) => {
+          console.error('Error: ', err);
+        },
+      });
 
-    this.accountData = (await lastValueFrom(
-      this.jsonrpc.rpc({
-        method: 'GetAccounts',
-        params: []
-      },
-      RpcService.bonusService
-    )))['Cards'][0];
+    const getAccount = await lastValueFrom(
+      this.jsonrpc.rpc(
+        {
+          method: 'GetAccounts',
+          params: [],
+        },
+        RpcService.bonusService
+      )
+    );
+
+    this.accountData = getAccount && getAccount['Cards'][0];
     this.loadingBonuses = false;
-    
-    barcode("#barcode")
-    .options({font: "OCR-B"}) // Will affect all barcodes
-    .EAN13(`${this.accountData.CardNumber}`.padStart(12, "0"), {fontSize: 18, textMargin: 0})
-    .render();
-    const transactions: Transaction[] = (await lastValueFrom(
-      this.jsonrpc.rpc(
-        {
-          method: 'GetAccountTransactions',
-          params: []
-        },
-        RpcService.bonusService
-      )))['Transactions'];
+    if (this.accountData) {
+      barcode('#barcode')
+        .options({ font: 'OCR-B' }) // Will affect all barcodes
+        .EAN13(`${this.accountData.CardNumber}`.padStart(12, '0'), {
+          fontSize: 18,
+          textMargin: 0,
+        })
+        .render();
+    }
+    const getTransactions = (
+      await lastValueFrom(
+        this.jsonrpc.rpc(
+          {
+            method: 'GetAccountTransactions',
+            params: [],
+          },
+          RpcService.bonusService
+        )
+      )
+    )
+    if (!getTransactions) {
+      this.messageService.add({severity:'error', summary:'Произошла ошибка, попробуйте позже'});
+      return
+    }
+    const transactions: Transaction[] = getTransactions && getTransactions['Transactions'];
 
-    const purchases: Purchase[] = (await lastValueFrom(
-      this.jsonrpc.rpc(
-        {
-          method: 'GetAccountPurchase',
-          params: []
-        },
-        RpcService.bonusService
-      )))['Purchases'];
+    const getPurchases = (
+      await lastValueFrom(
+        this.jsonrpc.rpc(
+          {
+            method: 'GetAccountPurchase',
+            params: [],
+          },
+          RpcService.bonusService
+        )
+      )
+    )
+    if (!getPurchases) {
+      this.messageService.add({severity:'error', summary:'Произошла ошибка, попробуйте позже'});
+      return
+    }
+    const purchases: Purchase[] = getPurchases && getPurchases['Purchases'];
 
-    this.purchases = purchases.map<Purchase>((purchase) => {
-      const id = purchase.ID.slice(0,36).toLowerCase();
+    this.purchases = purchases && purchases.map<Purchase>((purchase) => {
+      const id = purchase.ID.slice(0, 36).toLowerCase();
       purchase.Transactions = transactions.filter((transaction) => {
         const same = transaction.Purchase === id;
         transaction.HasPurchase = same;
@@ -102,28 +144,27 @@ export class BonusProgramComponent implements OnInit {
       });
       return purchase;
     });
-    transactions.forEach((transaction) => {
-      if(!transaction.HasPurchase){
-  			this.purchases.push({
-  				ID: transaction.ID,
+    transactions &&  transactions.forEach((transaction) => {
+      if (!transaction.HasPurchase) {
+        this.purchases.push({
+          ID: transaction.ID,
           PurchaseDate: transaction.Date,
           Transactions: [transaction],
           IsSingleTransaction: true,
-        })
+        });
       }
     });
-    this.purchases = this.purchases.sort((a,b) => {
+    this.purchases = this.purchases && this.purchases.sort((a, b) => {
       return moment(a.PurchaseDate).date() - moment(b.PurchaseDate).date();
     });
   }
 
-
   async addCardToWallet(e: any) {
-    e.preventDefault()
-    const token = this.cookiesService.getItem('token')
-    const accountData = (await lastValueFrom(
-      this.jsonrpc
-        .rpc(
+    e.preventDefault();
+    const token = this.cookiesService.getItem('token');
+    const accountData = (
+      await lastValueFrom(
+        this.jsonrpc.rpc(
           {
             method: 'getTokenData',
             params: [],
@@ -131,19 +172,17 @@ export class BonusProgramComponent implements OnInit {
           RpcService.authService,
           true
         )
-    )).data
+      )
+    ).data;
     if (token && accountData.user_id) {
       this.appleWallet.generateCard(token, accountData.user_id).subscribe({
         next: (res: any) => {
-          this.document.location.href = res.url
+          this.document.location.href = res.url;
         },
         error: (err) => {
           console.log('Error: ', err);
-          
-        }
-      })
+        },
+      });
     }
-    
   }
-
 }
diff --git a/angular/src/app/pages/account/orders/orders.component.html b/angular/src/app/pages/account/orders/orders.component.html
index e467710..5bbef58 100644
--- a/angular/src/app/pages/account/orders/orders.component.html
+++ b/angular/src/app/pages/account/orders/orders.component.html
@@ -67,7 +67,7 @@
     </tbody>
   </table>
   <p
-    *ngIf="purchases.length !== purchasesShortArray.length"
+    *ngIf="purchases?.length !== purchasesShortArray?.length"
     class="show-more-orders"
     (click)="getMoreOrders()"
   >
@@ -75,12 +75,12 @@
   </p>
   <p-progressSpinner
     *ngIf="ordersLoadingStatus"
-    [style]="{ width: '100%' }"
+    [style]="{ display: 'block' }"
     strokeWidth="2"
     styleClass="angular-spinner"
   ></p-progressSpinner>
   <p
-    *ngIf="purchases.length === 0 && !ordersLoadingStatus"
+    *ngIf="purchases?.length === 0 && !ordersLoadingStatus"
     style="width: 100%; text-align: center"
   >
     Нет заказов
diff --git a/angular/src/app/pages/account/orders/orders.component.ts b/angular/src/app/pages/account/orders/orders.component.ts
index d8e011b..ca83ba8 100644
--- a/angular/src/app/pages/account/orders/orders.component.ts
+++ b/angular/src/app/pages/account/orders/orders.component.ts
@@ -5,11 +5,12 @@ import { Purchase } from 'src/app/interface/data';
 import * as moment from 'moment-timezone';
 import { lastValueFrom } from 'rxjs';
 import { JsonrpcService, RpcService } from 'src/app/services/jsonrpc.service';
+import { MessageService } from 'primeng/api';
 
 @Component({
   selector: 'app-orders',
   templateUrl: './orders.component.html',
-  styleUrls: ['./orders.component.scss']
+  styleUrls: ['./orders.component.scss'],
 })
 export class OrdersComponent implements OnInit {
   @Input() handleHttpError!: (error: HttpErrorResponse) => void;
@@ -23,24 +24,31 @@ export class OrdersComponent implements OnInit {
     private route: ActivatedRoute,
     private router: Router,
     private jsonrpc: JsonrpcService,
-  ) { }
+    private messageService: MessageService,
+  ) {}
 
   ngOnInit(): void {
-    this.getOrders()
+    this.getOrders();
   }
 
-  async getOrders(){
-    const purchases: Purchase[] = (await lastValueFrom(
+  async getOrders() {
+    const getPurchases = await lastValueFrom(
       this.jsonrpc.rpc(
         {
           method: 'GetAccountPurchase',
-          params: []
+          params: [],
         },
         RpcService.bonusService
-      )))['Purchases'];
+      )
+    );
+    if (!getPurchases) {
+      this.messageService.add({severity:'error', summary:'Произошла ошибка, попробуйте позже'});
+      return
+    }
+    const purchases: Purchase[] = getPurchases && getPurchases['Purchases'];
 
-    this.purchases = purchases.map<Purchase>((purchase) => {
-      const id = purchase.ID.slice(0,36).toLowerCase();
+    this.purchases = purchases && purchases.map<Purchase>((purchase) => {
+      const id = purchase.ID.slice(0, 36).toLowerCase();
       // purchase.Transactions = transactions.filter((transaction) => {
       //   const same = transaction.Purchase === id;
       //   transaction.HasPurchase = same;
@@ -48,7 +56,7 @@ export class OrdersComponent implements OnInit {
       // });
       return purchase;
     });
-    this.purchasesShortArray = this.purchases.slice(0, this.lastViewOrder)
+    this.purchasesShortArray = this.purchases && this.purchases.slice(0, this.lastViewOrder);
     this.ordersLoadingStatus = false;
   }
 
diff --git a/angular/src/app/pages/account/ref-system/ref-system.component.ts b/angular/src/app/pages/account/ref-system/ref-system.component.ts
index f18e144..d210e7e 100644
--- a/angular/src/app/pages/account/ref-system/ref-system.component.ts
+++ b/angular/src/app/pages/account/ref-system/ref-system.component.ts
@@ -31,7 +31,6 @@ export class RefSystemComponent implements OnInit {
           true
         )
     )).data
-    console.log(accountData);
     
     this.refUrl += accountData.user_id
     this.loading = false
diff --git a/angular/src/app/pages/account/user-data/user-data.component.ts b/angular/src/app/pages/account/user-data/user-data.component.ts
index de59e34..5998486 100644
--- a/angular/src/app/pages/account/user-data/user-data.component.ts
+++ b/angular/src/app/pages/account/user-data/user-data.component.ts
@@ -34,6 +34,10 @@ export class UserDataComponent implements OnInit {
       params: []
     }, RpcService.authService, true).subscribe({
       next: (res) => {
+        if (!res.data) {
+          this.messageService.add({severity:'error', summary:'Произошла ошибка, попробуйте позже'});
+          return
+        }
         const { first_name, birthdate, gender } = res.data
         this.userData = { first_name, birthdate, gender }
         this.createUserDataForm({...this.userData})
diff --git a/angular/src/app/pages/main/main.component.html b/angular/src/app/pages/main/main.component.html
index 457c663..7e1c743 100644
--- a/angular/src/app/pages/main/main.component.html
+++ b/angular/src/app/pages/main/main.component.html
@@ -1,7 +1,7 @@
 <div class="main-container">
     <app-navbar></app-navbar>
     <p-toast position="top-center"></p-toast>
-    <app-footer-buttons [token]="token" [deferredPrompt]="deferredPrompt"
-        [isPermissionNotifications]="isPermissionNotifications" (downloadingPWA)="downloadPWA()"
+    <app-footer-buttons [token]="token"
+        [isPermissionNotifications]="isPermissionNotifications"
         (requestingPermission)="requestPermission()"></app-footer-buttons>
 </div>
\ No newline at end of file
diff --git a/angular/src/app/pages/main/main.component.ts b/angular/src/app/pages/main/main.component.ts
index 5fe1f24..92405d9 100644
--- a/angular/src/app/pages/main/main.component.ts
+++ b/angular/src/app/pages/main/main.component.ts
@@ -24,7 +24,6 @@ export class MainComponent implements OnInit {
   private cardComponent!: ComponentRef<CardComponent>;
   private accountComponent!: ComponentRef<AccountComponent>;
   public messagingToken!: string | null;
-  public deferredPrompt: any;
   public isPermissionNotifications: boolean = false;
   public token = '';
   public message: any;
@@ -32,20 +31,11 @@ export class MainComponent implements OnInit {
   constructor(
     private route: ActivatedRoute,
     private viewContainerRef: ViewContainerRef,
-    private afMessaging: AngularFireMessaging,
     public el: ElementRef,
     public renderer: Renderer2,
-    private messageService: MessageService,
     private messagingService: MessagingService,
     private cookiesService: CookiesService,
   ) {
-    renderer.listen('window', 'appinstalled', (evt) => {
-      console.log('INSTALLED!!!');
-    });
-    renderer.listen('window', 'beforeinstallprompt', (e) => {
-      e.preventDefault();
-      this.deferredPrompt = e;
-    });
     route.queryParams.subscribe((params) => {
       if (params['token']) {
         this.token = params['token']
@@ -61,27 +51,6 @@ export class MainComponent implements OnInit {
     // this.checkRequestPermission()
   }
 
-  downloadPWA() {
-    if (!this.deferredPrompt) {
-      this.messageService.add({
-        severity: 'error',
-        summary: 'Не поддерживается в Вашем браузере!',
-      });
-      return;
-    }
-    this.deferredPrompt.prompt();
-    this.deferredPrompt.userChoice.then((res: any) => {
-      if (res.outcome === 'accepted') {
-        this.messageService.add({
-          severity: 'custom',
-          summary: 'Спасибо за установку!',
-        });
-        console.log('User Accepted!!!');
-      }
-      this.deferredPrompt = null;
-    });
-  }
-
   checkRequestPermission() {
     this.isPermissionNotifications =
       Notification.permission !== 'granted' ? false : true;
@@ -100,20 +69,6 @@ export class MainComponent implements OnInit {
       this.message = this.messagingService.currentMessage;
     }
   }
-  // test function
-  copyMessage(val: string | null) {
-    const selBox = document.createElement('textarea');
-    selBox.style.position = 'fixed';
-    selBox.style.left = '0';
-    selBox.style.top = '0';
-    selBox.style.opacity = '0';
-    if (val) selBox.value = val;
-    document.body.appendChild(selBox);
-    selBox.focus();
-    selBox.select();
-    document.execCommand('copy');
-    document.body.removeChild(selBox);
-  }
 
   appendCard(): void {
     const route = this.route.snapshot.url[0]?.path;
diff --git a/angular/src/assets/menu-icons/download-app.png b/angular/src/assets/menu-icons/download-app.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e1042598a52e6423f6947c6d0c3979954f8ecf9
GIT binary patch
literal 8858
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
Q?UCQSZlYiGhr?h02jkl1s{jB1

literal 0
HcmV?d00001