From e640539d968ff6ef747b198131db3e67df2d0d58 Mon Sep 17 00:00:00 2001
From: nikolay <gugalohikolaychur@gmail.com>
Date: Thu, 29 Jun 2023 15:35:34 +0400
Subject: [PATCH] =?UTF-8?q?dev=20#14607=20=D0=9C=D0=BE=D1=80=D0=B5.=20?=
 =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF=D0=BE=20=D1=81?=
 =?UTF-8?q?=D0=B0=D0=B9=D1=82=D1=83:=20fix=20notification=20and=20auth=20n?=
 =?UTF-8?q?ew=5Fcustomer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/navbar/navbar.component.html   |  4 +--
 .../guest-card/guest-card.component.html      | 16 ++++++------
 .../guest-card/guest-card.component.scss      |  4 +--
 angular/src/app/services/auth.service.ts      | 25 +++++++++----------
 angular/src/manifest.webmanifest              |  4 +--
 angular/src/styles.scss                       |  4 +--
 6 files changed, 26 insertions(+), 31 deletions(-)

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 d35e17f..f31a1db 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
@@ -7,7 +7,7 @@
     <div *ngIf="showDropdown" class="backdrop" (click)="closeMenu()"></div>
     <div *ngIf="showMenu" class="menu">
       <button mat-button (click)="toggleMenu()">
-	<span class="material-icons" style="color: var(--background-color)">
+	<span class="material-icons" style="color: var(--text-color)">
 	  more_horiz	
 	</span>
       </button>
@@ -15,7 +15,7 @@
       <div class="menu__dropdown" *ngIf="showDropdown">
 	<ul>	  
 	  <menu-item [handler]="handler(aboutApp)">
-	    <span class="material-icons icon" style="color: var(--background-color)">
+	    <span class="material-icons icon" style="color: var(--main-color)">
 	      info
 	    </span>
 	    <span class="item_title">О приложении</span>
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 b4bebfa..8e85e22 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
@@ -4,14 +4,6 @@
     <div class="logo">
       <img src="./assets/LOGO3.svg" alt=""/>
     </div>
-    <div *ngIf="authService.userInfo?.name" class="owner">
-      <span>Владелец карты</span>
-      <span class="name">{{authService.userInfo.name}}</span>								      
-    </div>
-    <div class="bonuses">
-      <span>Бонусы</span>
-      <span>{{authService.getBalanceAmount($any(authService.userInfo?.walletBalances))}}</span>
-    </div>
     <div class="guest-card__qr" (click)="qrCodeClick()">      
       <qr-code
 	[value]="authService.userInfo?.phone?.substr(1) || 'Данные не найдены'"
@@ -23,6 +15,14 @@
 	></qr-code>
       <span class="qr-value">{{authService.userInfo?.phone}}</span>
     </div>								    
+    <div *ngIf="authService.userInfo?.name" class="owner">
+      <span>Владелец карты</span>
+      <span class="name">{{authService.userInfo.name}}</span>								      
+    </div>
+    <div class="bonuses">
+      <span>Бонусы</span>
+      <span>{{authService.getBalanceAmount($any(authService.userInfo?.walletBalances))}}</span>
+    </div>    
   </div>
 </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 c70e18c..338b472 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
@@ -229,9 +229,7 @@
 	    font-style: italic;
 	}
 
-	.logo {
-	    margin-bottom: 200px;
-
+	.logo {	    
 	    img {
 		width: 40%;
 	    }
diff --git a/angular/src/app/services/auth.service.ts b/angular/src/app/services/auth.service.ts
index d20cb01..f8c809f 100644
--- a/angular/src/app/services/auth.service.ts
+++ b/angular/src/app/services/auth.service.ts
@@ -69,18 +69,7 @@ export class AuthService {
       )
       .subscribe({
         next: (value) => {
-          if (value && value.customer_info && value.customer_info.errorCode === 'Customer_CustomerNotFound') {
-            this.wpJsonService.newCustomer(
-              environment.systemId,
-              token,
-              environment.icardProxy,
-            )
-              .subscribe({
-                next: () => {
-                  this.getUserInfo();
-                }
-              })
-          } else if (value && value.error && value.error.code > 1) {
+          if (value && value.error && value.error.code > 1) {
             this.messageService.clear();
             this.messageService.add({
               severity: 'error',
@@ -186,7 +175,17 @@ export class AuthService {
             ).subscribe({
               next: () => {
                 this.router.navigate(['/']);
-                this.getUserInfo();
+
+                this.wpJsonService.newCustomer(
+                  environment.systemId,
+                  result?.data?.token,
+                  environment.icardProxy,
+                )
+                  .subscribe({
+                    next: () => {
+                      this.getUserInfo();
+                    }
+                  })
               },
               error: (err) => {
                 console.error(err);
diff --git a/angular/src/manifest.webmanifest b/angular/src/manifest.webmanifest
index 38955e3..9c45d99 100644
--- a/angular/src/manifest.webmanifest
+++ b/angular/src/manifest.webmanifest
@@ -1,6 +1,6 @@
 {
-  "name": "Coffee Like More",
-  "short_name": "Coffee Like More",
+  "name": "More",
+  "short_name": "More",
   "theme_color": "#1976d2",
   "background_color": "#fafafa",
   "display": "standalone",
diff --git a/angular/src/styles.scss b/angular/src/styles.scss
index 2f2afcb..57f7bc9 100644
--- a/angular/src/styles.scss
+++ b/angular/src/styles.scss
@@ -245,14 +245,12 @@ input::-webkit-date-and-time-value {
     text-align: left;
 }
 
-
 .p-toast-message-custom {
     background-color: var(--background-color);
     border: solid var(--main-color);
-    border-width: 0 0 0 6px;
     color: var(--text-color);
 
-    .p-toast-icon-close {
+    .p-toast-icon-close {	
         color: var(--main-color);
     }
 }