From baf5300439433174e6d905983ddac71e53d20ae8 Mon Sep 17 00:00:00 2001
From: Kataev Denis <kataev@hlcompany.ru>
Date: Fri, 23 Sep 2022 10:49:23 +0400
Subject: [PATCH] =?UTF-8?q?dev=20#12401=20=D0=9F=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../footer-buttons/footer-buttons.component.html   |  4 ++++
 .../footer-buttons/footer-buttons.component.scss   | 12 ++++++++++++
 .../footer-buttons/footer-buttons.component.ts     |  5 ++++-
 src/app/pages/account/auth/auth.component.html     |  4 ++--
 src/app/pages/account/auth/auth.component.scss     |  2 +-
 .../bonus-program/bonus-program.component.html     |  6 +++---
 .../bonus-program/bonus-program.component.ts       | 14 ++++++++++++++
 src/environments/environment.prod.ts               |  5 ++++-
 src/environments/environment.ts                    |  5 ++++-
 src/styles.scss                                    |  2 +-
 tsconfig.app.json                                  |  4 +++-
 tsconfig.json                                      |  4 +++-
 12 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/src/app/components/footer-buttons/footer-buttons.component.html b/src/app/components/footer-buttons/footer-buttons.component.html
index 42f39f5..b69897f 100644
--- a/src/app/components/footer-buttons/footer-buttons.component.html
+++ b/src/app/components/footer-buttons/footer-buttons.component.html
@@ -1,3 +1,7 @@
+<span class="version">
+  v{{version}}
+</span>
+
 <div class="footer-buttons-container">
   <!-- *ngIf="deferredPrompt && token?.length" -->
   <button
diff --git a/src/app/components/footer-buttons/footer-buttons.component.scss b/src/app/components/footer-buttons/footer-buttons.component.scss
index a027c25..05353ad 100644
--- a/src/app/components/footer-buttons/footer-buttons.component.scss
+++ b/src/app/components/footer-buttons/footer-buttons.component.scss
@@ -31,6 +31,18 @@
     }
   }
 
+  .version {
+    position: fixed;
+    bottom: 16px;
+    left: 8px;
+    background: #09467f;
+    padding: 6px;
+    color: #fff;
+    border-radius: 4px;
+    font-weight: 100;
+    font-size: 12px;
+  }
+
   @media (display-mode: standalone) {
     .download {
       display: none;
diff --git a/src/app/components/footer-buttons/footer-buttons.component.ts b/src/app/components/footer-buttons/footer-buttons.component.ts
index 7ef3987..9f664d5 100644
--- a/src/app/components/footer-buttons/footer-buttons.component.ts
+++ b/src/app/components/footer-buttons/footer-buttons.component.ts
@@ -1,5 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { MessageService } from 'primeng/api';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-footer-buttons',
@@ -13,6 +14,7 @@ export class FooterButtonsComponent implements OnInit {
   @Output() downloadingPWA = new EventEmitter<null>();
   @Output() requestingPermission = new EventEmitter<null>();
   public deviceType: 'ios' | 'android' | null = null;
+  public version: string = environment.version;
 
   constructor(
     private messageService: MessageService,
@@ -32,7 +34,8 @@ export class FooterButtonsComponent implements OnInit {
     if (this.deviceType === 'ios') {
       this.messageService.add({
         severity: 'custom',
-        summary: "Для установки нажмите на кнопку поделиться в Вашем браузере и выберите пункт 'Добавить на главный экран'",
+        summary: `Для установки нажмите на кнопку поделиться в Вашем браузере и выберите пункт 'На экран «Домой»'`,
+        sticky: true
       });
       return
     }
diff --git a/src/app/pages/account/auth/auth.component.html b/src/app/pages/account/auth/auth.component.html
index 350bb38..f84c712 100644
--- a/src/app/pages/account/auth/auth.component.html
+++ b/src/app/pages/account/auth/auth.component.html
@@ -40,7 +40,7 @@
         ></p-progressSpinner>
       </button>
     </p>
-    <div class="decoration-pattern" style="background: url('./assets/card-decorative-pattern.png') repeat-x;"></div>
+    <div class="decoration-pattern" style="background: url('./assets/card-decorative-pattern.png') no-repeat;"></div>
   </form>
 </ng-container>
 <ng-template #confirmPhoneField>
@@ -89,6 +89,6 @@
     <p style="color: red; margin: 0" *ngIf="errorConfirmCode">
       Пароль введен неверно
     </p>
-    <div class="decoration-pattern" style="background: url('./assets/card-decorative-pattern.png') repeat-x;"></div>
+    <div class="decoration-pattern" style="background: url('./assets/card-decorative-pattern.png') no-repeat;"></div>
   </form>
 </ng-template>
diff --git a/src/app/pages/account/auth/auth.component.scss b/src/app/pages/account/auth/auth.component.scss
index 840f104..d677247 100644
--- a/src/app/pages/account/auth/auth.component.scss
+++ b/src/app/pages/account/auth/auth.component.scss
@@ -89,7 +89,7 @@
     }
   }
   .decoration-pattern {
-    width: 100%;
+    width: calc(100% - 24px);
     height: 34px;
   }
 }
diff --git a/src/app/pages/account/bonus-program/bonus-program.component.html b/src/app/pages/account/bonus-program/bonus-program.component.html
index 32e4cc7..25510fa 100644
--- a/src/app/pages/account/bonus-program/bonus-program.component.html
+++ b/src/app/pages/account/bonus-program/bonus-program.component.html
@@ -17,10 +17,10 @@
         <div class="info">
           <div *ngIf="accountData" class="row">
             <span class="key">Имя</span>
-            <span class="value" *ngIf="accountData.BonusProgramName">{{
-              accountData.BonusProgramName
+            <span class="value" *ngIf="userName.length">{{
+              userName
             }}</span>
-            <span class="value" *ngIf="!accountData.BonusProgramName"
+            <span class="value" *ngIf="!userName.length"
               >Не задано</span
             >
           </div>
diff --git a/src/app/pages/account/bonus-program/bonus-program.component.ts b/src/app/pages/account/bonus-program/bonus-program.component.ts
index 9ffc876..c663676 100644
--- a/src/app/pages/account/bonus-program/bonus-program.component.ts
+++ b/src/app/pages/account/bonus-program/bonus-program.component.ts
@@ -21,6 +21,7 @@ export class BonusProgramComponent implements OnInit {
   readonly moment = moment;
   readonly pageList = environment.hasBonusProgram ? PageListWithBonus : PageList;
   public currentPage: Page = this.pageList[1];
+  public userName: string = '';
 
   constructor(
     private jsonrpc: JsonrpcService,
@@ -32,6 +33,19 @@ export class BonusProgramComponent implements OnInit {
 
   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.accountData = (await lastValueFrom(
       this.jsonrpc.rpc({
         method: 'GetAccounts',
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 2ffd3d5..1f25c71 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,3 +1,5 @@
+import packageJson from '../../package.json';
+
 export const environment = {
   production: true,
   appAuthEndpoint: 'https://testauth.crm4retail.ru/tnt',
@@ -13,5 +15,6 @@ export const environment = {
     storageBucket: "push-notification-test2-56dac.appspot.com",
     messagingSenderId: "1004369687552",
     appId: "1:1004369687552:web:a6cc20625e05520a37d4e5"
-  }
+  },
+  version: packageJson.version,
 }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 2119f53..25af6dd 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -1,3 +1,5 @@
+import packageJson from '../../package.json';
+
 export const environment = {
   production: false,
   appAuthEndpoint: 'https://testauth.crm4retail.ru/tnt',
@@ -13,5 +15,6 @@ export const environment = {
     storageBucket: "push-notification-test2-56dac.appspot.com",
     messagingSenderId: "1004369687552",
     appId: "1:1004369687552:web:a6cc20625e05520a37d4e5"
-  }
+  },
+  version: packageJson.version,
 };
diff --git a/src/styles.scss b/src/styles.scss
index edb2a38..bac2ba7 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -40,7 +40,7 @@ button {
     background-color: #fff;
     border: solid #09467F;
     border-width: 0 0 0 6px;
-    color: #09467F;
+    color: #000;
     .p-toast-icon-close {
         color: #09467F;
     }
diff --git a/tsconfig.app.json b/tsconfig.app.json
index 82d91dc..a0ad9c6 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -3,7 +3,9 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/app",
-    "types": []
+    "types": [],
+    "resolveJsonModule": true,
+    "allowSyntheticDefaultImports": true,
   },
   "files": [
     "src/main.ts",
diff --git a/tsconfig.json b/tsconfig.json
index ff06eae..5b6384b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,7 +21,9 @@
     "lib": [
       "es2020",
       "dom"
-    ]
+    ],
+    "resolveJsonModule": true,
+    "allowSyntheticDefaultImports": true,
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,