diff --git a/angular/src/app/interface/data.ts b/angular/src/app/interface/data.ts
index 5397296..bb1a3e0 100644
--- a/angular/src/app/interface/data.ts
+++ b/angular/src/app/interface/data.ts
@@ -206,5 +206,10 @@ export interface UserInfo {
id: string;
name: string | null;
phone: string;
- walletBalances: UserInfoWalletBalance[];
+ walletBalances: UserInfoWalletBalance[] | { error: ResponseError };
+}
+
+export interface ResponseError {
+ code: number;
+ msg: string;
}
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 d90826c..822a01f 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
@@ -7,8 +7,13 @@
Кэшбек {{ authService.currentLvlPeriod.percent }}%
- {{ Math.floor(authService.getBalanceAmount(authService.userInfo.walletBalances)) }}
- бонусов
+
+ {{ Math.floor(authService.getBalanceAmount($any(authService.userInfo.walletBalances))) }}
+ бонусов
+
+
+ Ошибка! Отрицательный баланс бонусов
+
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 f216f42..439062a 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,6 +6,7 @@ import { MessageService } from 'primeng/api';
import { MessagingService } from 'src/app/services/messaging.service';
import { DeviceType, getTypeDevice } from 'src/app/utils';
import { AuthService } from 'src/app/services/auth.service';
+import { ResponseError } from 'src/app/interface/data';
@Component({
selector: 'app-guest-card',
@@ -17,6 +18,11 @@ export class GuestCardComponent implements OnInit {
private isQrCodeClicked: boolean = false;
public Math: Math = Math;
public showBack: boolean = false;
+ public negativeBalance: boolean = false;
+
+ get isNegativeBalance(): boolean {
+ return !Array.isArray(this.authService.userInfo?.walletBalances);
+ }
constructor(
private _bottomSheet: MatBottomSheet,
@@ -27,6 +33,7 @@ export class GuestCardComponent implements OnInit {
) { }
ngOnInit(): void {
+ this.negativeBalance = !Array.isArray(this.authService.userInfo?.walletBalances);
this.showBack = getTypeDevice() === DeviceType.android;
this.requestPermission();
diff --git a/angular/src/app/presentation-options/default-option/pages/login/.#login.component.ts b/angular/src/app/presentation-options/default-option/pages/login/.#login.component.ts
deleted file mode 120000
index f3c7064..0000000
--- a/angular/src/app/presentation-options/default-option/pages/login/.#login.component.ts
+++ /dev/null
@@ -1 +0,0 @@
-nikolay@arch.6700:1687496762
\ No newline at end of file
diff --git a/angular/src/app/services/auth.service.ts b/angular/src/app/services/auth.service.ts
index 9949530..29b53b7 100644
--- a/angular/src/app/services/auth.service.ts
+++ b/angular/src/app/services/auth.service.ts
@@ -4,7 +4,7 @@ import { WpJsonService } from './wp-json.service';
import { environment } from 'src/environments/environment';
import { JsonrpcService, RpcService } from './jsonrpc.service';
import { MessageService } from 'primeng/api';
-import { UserInfo, Purchase, lvlPeriod, UserInfoWalletBalance } from '../interface/data';
+import { UserInfo, Purchase, lvlPeriod, UserInfoWalletBalance, ResponseError } from '../interface/data';
import { lvlPeriods } from 'src/app/app.constants';
import moment, { Moment } from 'moment-timezone';
import { Router } from '@angular/router';