diff --git a/angular/src/app/presentation-options/default-option/components/last-order/last-order.component.html b/angular/src/app/presentation-options/default-option/components/last-order/last-order.component.html index 0122aa8..0256b05 100644 --- a/angular/src/app/presentation-options/default-option/components/last-order/last-order.component.html +++ b/angular/src/app/presentation-options/default-option/components/last-order/last-order.component.html @@ -1,6 +1,6 @@ -

Ваш предыдущий заказ

+

Ваш предыдущий заказ

Дата: {{lastOrder!.last_purchase_date}}

@@ -10,7 +10,7 @@

- Данные не найдены + Покупок за последние пол года не было

diff --git a/angular/src/app/presentation-options/default-option/components/last-order/last-order.component.scss b/angular/src/app/presentation-options/default-option/components/last-order/last-order.component.scss index d63ac59..17a71b3 100644 --- a/angular/src/app/presentation-options/default-option/components/last-order/last-order.component.scss +++ b/angular/src/app/presentation-options/default-option/components/last-order/last-order.component.scss @@ -1,51 +1,50 @@ :host { - padding: 24px 16px 0px; + padding: 24px 16px 0px; - & > h2 { - font-style: normal; - font-weight: 700; - font-size: 15px; - line-height: 20px; - letter-spacing: -0.24px; - } - - & > .info-order { - font-style: normal; - font-weight: 400; - font-size: 12px; - line-height: 16px; - span { - color: var(--text-color_1); + & > .info-order { + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; + h2 { + font-style: normal; + font-weight: 700; + font-size: 15px; + line-height: 20px; + letter-spacing: -0.24px; + } + span { + color: var(--text-color_1); + } + .flex { + display: flex; + align-items: center; + flex-direction: row; + gap: 8px; + } } - .flex { - display: flex; - align-items: center; - flex-direction: row; - gap: 8px; + + .evaluate-order { + margin: 24px 0; + width: 100%; + padding: 12px; + text-align: center; + border: 2px solid var(--button-color); + border-radius: 6px; + font-style: normal; + font-weight: 700; + font-size: 17px; + line-height: 22px; + letter-spacing: -0.408px; + background-color: transparent; + color: var(--button-color); } - } - .evaluate-order { - margin: 24px 0; - width: 100%; - padding: 12px; - text-align: center; - border: 2px solid var(--button-color); - border-radius: 6px; - font-style: normal; - font-weight: 700; - font-size: 17px; - line-height: 22px; - letter-spacing: -0.408px; - background-color: transparent; - color: var(--button-color); - } - - .info { - font-style: normal; - font-weight: 400; - font-size: 12px; - line-height: 16px; - color: var(--text-color_1); - } + .info { + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; + color: var(--text-color_1); + } } diff --git a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html index 5bb96fd..7eae632 100644 --- a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html +++ b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html @@ -1,14 +1,12 @@
-
-

{{title}}

-
- -
+ +
+

{{title}}

-
+
-
    +
      info О приложении - - - Добавить карточку в Wallet - + + + + Добавить карточку в Wallet + + + + + + + Установить приложение + + + + + notifications + + + Подписаться на уведомления + + + logout @@ -36,16 +52,5 @@
-
- - -
-
+
diff --git a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss index a7e7239..a25fff6 100644 --- a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss +++ b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss @@ -21,12 +21,12 @@ flex-direction: column; gap: 10px; .block { - display: flex; - justify-content: space-between; + display: flex; align-items: center; + justify-content: space-between; } .back { - width: 40px; + width: 64px; } .back-arrow { font-size: 16px; @@ -43,23 +43,17 @@ font-weight: 700; font-size: 17px; line-height: 22px; - margin: 0 auto; - - } - .wrapper { - display: flex; - align-items: center; - gap: 10px; - min-width: 40px; - } + margin: 0 auto; + } .menu { position: relative; + width: 64px; .menu__dropdown { z-index: 110; - position: fixed; + position: absolute; background-color: white; - width: fit-content; + width: 250px; height: fit-content; right: 20px; border-radius: 6px; diff --git a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts index 7e76690..9649311 100644 --- a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts +++ b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts @@ -16,8 +16,8 @@ export class NavbarComponent implements OnInit { @Input() title: string = 'Название не задано' @Input() backEvent?: () => void; - showMenu: boolean = false; showDropdown: boolean = false; + isios: boolean = false; constructor( public messagingService: MessagingService, @@ -37,9 +37,7 @@ export class NavbarComponent implements OnInit { aboutApp() { } ngOnInit(): void { - const deviceType = getTypeDevice(); - - this.showMenu = deviceType === DeviceType.ios; + this.isios = getTypeDevice() == DeviceType.ios; } toggleMenu() { @@ -78,5 +76,7 @@ export class NavbarComponent implements OnInit { }, }); } + + installApp = () => { } } 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 e593ae2..a6acbd1 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 @@ -1,19 +1,26 @@ - +
-

Уровень {{ authService.userInfo.current_level_and_cashback?.current_level ?? '--' }}

-

Кэшбек {{ authService.currentLvlPeriod.percent }}%

+

Уровень {{ authService.error ? '--' : authService.userInfo.current_level_and_cashback?.current_level }}

+

Кэшбек {{ authService.error ? '--' : authService.currentLvlPeriod.percent }}%

-

- {{ Math.floor(authService.userInfo.walletBalances) }} - бонусов -

+ +

+ Отрицательный баланс бонусов, свяжитесь с техподдержкой +

+ + +

+ {{ authService.error ? '--' : Math.floor(authService.userInfo.walletBalances) }} + бонусов +

+
Осталось купить на сумму {{ - authService.userInfo.next_level.sum_for_next_level + authService.error ? '--' : authService.userInfo.next_level.sum_for_next_level }} рублей, тогда кэшбек будет - {{ authService.userInfo.next_level.cashback }}% + {{ authService.error ? '--' : authService.userInfo.next_level.cashback}}% с {{ authService.currentPeriod[1] @@ -35,15 +42,28 @@ }}

- - - Подробнее о правилах
- Программы лояльности + + + + + + Подробнее о правилах +
+ Программы лояльности + + + + +

+ Упс, что-то пошло не так.. + Мы уже работаем над этой проблемой. + Попробуйте обновить страницу или зайти попозже. + Приносим извинения за неудобства. +

+
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 9f34845..9229ca6 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 @@ -4,7 +4,6 @@ import { ExitComponent } from 'src/app/components/exit/exit.component'; import { CookiesService } from 'src/app/services/cookies.service'; 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'; @Component({ @@ -16,7 +15,7 @@ export class GuestCardComponent implements OnInit { public qrCodeSize: number = 85; private isQrCodeClicked: boolean = false; public Math: Math = Math; - public showBack: boolean = false; + public phone?: string; constructor( private _bottomSheet: MatBottomSheet, @@ -27,7 +26,7 @@ export class GuestCardComponent implements OnInit { ) { } ngOnInit(): void { - this.showBack = getTypeDevice() === DeviceType.android; + this.phone = this.cookiesService.getItem('phone-number') || this.authService.userInfo?.phone; this.requestPermission(); } diff --git a/angular/src/app/services/auth.service.ts b/angular/src/app/services/auth.service.ts index 71e2c28..389418e 100644 --- a/angular/src/app/services/auth.service.ts +++ b/angular/src/app/services/auth.service.ts @@ -17,7 +17,7 @@ export class AuthService { currentPeriod: Moment[] = []; userInfo?: UserInfo; loading: boolean = false; - error: any; + error?: any; timeLeft: number = 0; get currentLvlPeriod(): lvlPeriod { @@ -50,6 +50,7 @@ export class AuthService { return; } + this.error = null; this.loading = true; this.wpJsonService @@ -60,6 +61,7 @@ export class AuthService { ) .subscribe({ next: (value) => { + this.userInfo = value.customer_info; if (value && value.error && value.error.code === 11) { this.wpJsonService.newCustomer( environment.systemId, @@ -72,15 +74,14 @@ export class AuthService { } }) } else if (value && value.error && value.error.code > 1) { + this.error = value.error; this.messageService.clear(); this.messageService.add({ severity: 'error', summary: 'Произошла ошибка! Попробуйте позже', }); } else if (value && value.customer_info) { - this.userInfo = value.customer_info; - - this.cookiesService.setCookie('phone-number', this.userInfo!.phone?.slice(2)); + this.cookiesService.setCookie('phone-number', this.userInfo!.phone); } }, error: (e) => { diff --git a/angular/src/assets/broken.jpg b/angular/src/assets/broken.jpg new file mode 100644 index 0000000..7f835e5 Binary files /dev/null and b/angular/src/assets/broken.jpg differ diff --git a/angular/src/assets/coffee-like-logo.svg b/angular/src/assets/coffee-like-logo.svg new file mode 100644 index 0000000..77926ac --- /dev/null +++ b/angular/src/assets/coffee-like-logo.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + +