From c5e4f3c2292d3ef361fb4375f8370c498e56cddc Mon Sep 17 00:00:00 2001
From: nikolay <gugalohikolaychur@gmail.com>
Date: Wed, 17 May 2023 11:42:50 +0400
Subject: [PATCH] =?UTF-8?q?dev=20#14305=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD?=
 =?UTF-8?q?=D0=B0=20WPA=20=D0=9A=D0=BE=D1=84=D0=B5-=D0=BB=D0=B0=D0=B9?=
 =?UTF-8?q?=D0=BA=D0=B0:=20block=20user=20with=20no=20info?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 angular/src/app/app-routing.module.ts               | 13 +------------
 .../pages/guest-card/guest-card.component.html      |  9 +++++++--
 .../pages/guest-card/guest-card.component.scss      |  8 ++++++++
 .../pages/guest-card/guest-card.component.ts        |  3 ++-
 angular/src/app/services/loyalty-program.service.ts |  2 +-
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/angular/src/app/app-routing.module.ts b/angular/src/app/app-routing.module.ts
index a4c8a17..531c9f8 100644
--- a/angular/src/app/app-routing.module.ts
+++ b/angular/src/app/app-routing.module.ts
@@ -1,10 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { MainComponent } from './pages/main/main.component';
-import { GuestCardComponent } from './pages/guest-card/guest-card.component';
-import { LoginComponent } from './pages/login/login.component';
 import { AuthGuard } from './guards/auth-guard.guard';
-import { LoyalityProgramComponent } from './pages/loyality-program/loyality-program.component';
 
 const routes: Routes = [
   {
@@ -12,15 +9,7 @@ const routes: Routes = [
       loadChildren: () => null as any,
       // component: GuestCardComponent,
       // canActivate: [AuthGuard]
-  },
-  {
-    path: 'login',
-    component: LoginComponent
-  },
-	{
-		path: 'loyality-program',
-		component: LoyalityProgramComponent,
-	}
+  },  
   // { path: '**', component: NotFoundComponent }
 ];
 
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 dce7733..1428a30 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
@@ -88,14 +88,19 @@
       [lastOrder]="lastPurchase"
       [loading]="loyaltyProgram.purchaseData.$loading"
     ></app-last-order>
-    <a class="guest-card__loyalty-program" routerLink="loyality-program"
+    <a class="guest-card__loyalty-program" routerLink="loyality-program"       
       >Подробнее о правилах <br />
       Программы лояльности</a
     >
   </div>
   <app-footer></app-footer>
 </ng-container>
-<ng-container *ngIf="this.loyaltyProgram.purchaseData.$loading || !customerInfo">
+<ng-container *ngIf="!customerInfo && !loyaltyProgram.purchaseData.$loading">
+  <div class="not-found">
+    <p>Данные недоступны, попробуйте позже</p>
+  </div>
+</ng-container>
+<ng-container *ngIf="loyaltyProgram.purchaseData.$loading">
   <ng-container
     *ngTemplateOutlet="spinner; context: { $implicit: 85 }"
     ></ng-container>  
diff --git a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.scss b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.scss
index d8f5ee0..3a2fa23 100644
--- a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.scss
+++ b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.scss
@@ -206,6 +206,14 @@
   .wrapper {
       padding-top: 20px;
   }
+
+  .not-found {
+      display: flex;
+      width: 100%;
+      height: 100%;
+      justify-content: center;
+      align-items: center;
+  }
 }
 
 app-accordion {
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 3fda8c1..e23805d 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
@@ -35,6 +35,7 @@ export class GuestCardComponent implements OnInit {
 
   ngOnInit(): void {
     const token = this.cookiesService.getItem('token');
+		this.loyaltyProgram.purchaseData.$loading = true;
     this.wpJsonService
       .getCustomerInfo(
         environment.systemId,
@@ -68,7 +69,7 @@ export class GuestCardComponent implements OnInit {
 
   deleteToken(): void {
     this.cookiesService.logout();
-  }
+  }	
 
   logout() {
     const bottomSheet = this._bottomSheet.open(ExitComponent);
diff --git a/angular/src/app/services/loyalty-program.service.ts b/angular/src/app/services/loyalty-program.service.ts
index f78813d..8ffa6a3 100644
--- a/angular/src/app/services/loyalty-program.service.ts
+++ b/angular/src/app/services/loyalty-program.service.ts
@@ -22,7 +22,7 @@ export class LoyaltyProgramService {
     lastPeriod: [],
     lastPurchases: [],
     currentPurchases: [],
-    $loading: true,
+    $loading: false,
     get currentAmount(): number {
       const amount = this.currentPurchases.reduce(
         (accumulator, currentValue) => {