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" > - Подробнее о правилах
Программы лояльности
- + +
+

Данные недоступны, попробуйте позже

+
+
+ 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) => {