From 08c4bdb12dc032e59b205775a6d34dd7f966e985 Mon Sep 17 00:00:00 2001
From: bsv <sb05032002@gmail.com>
Date: Mon, 17 Apr 2023 17:11:08 +0400
Subject: [PATCH] =?UTF-8?q?14087=20-=20=D0=9F=D0=B8=D1=82=D1=8C=D1=81?=
 =?UTF-8?q?=D0=B1=D1=83=D1=80=D0=B3.=20=D0=9F=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=B2=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                               | 2 +-
 src/app/pages/orders/orders.component.html | 6 +++---
 src/app/pages/orders/orders.component.ts   | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 80525e7..805d7dd 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "ng": "ng",
     "start": "ng serve --proxy-config proxy.confi.json",
     "build": "ng build",
-    "build-test:lithium": "ng build --output-path=/var/www/html/selfdelivery-pitsburg-test.mydatahosting.ru  --configuration=test",
+    "build-test:lithium": "ng build --configuration=test",
     "build-prod:lithium": "ng build --output-path=/var/www/html/selfdelivery-pitsburg.mydatahosting.ru", 
     "watch": "ng build --watch --configuration development",
     "test": "ng test"
diff --git a/src/app/pages/orders/orders.component.html b/src/app/pages/orders/orders.component.html
index 2fb70a1..c225a56 100644
--- a/src/app/pages/orders/orders.component.html
+++ b/src/app/pages/orders/orders.component.html
@@ -68,7 +68,7 @@
 <ng-template #order_v>
   <div>
     <button (click)="listOrders()">К списку</button>
-    <h1>Заказ: {{order[0].id}}</h1>
+    <h1>Заказ: {{order[0]?.id}}</h1>
     <p-table [value]="order">
       <ng-template pTemplate="header">
         <tr>
@@ -150,7 +150,7 @@
         <tr>
           <th>Сумма оплаты</th>
           <th>Тип оплаты</th>
-          <th *ngIf="order[0].payment[0]?.type !== 'CASH'">Статус оплаты</th>
+          <th *ngIf="order[0].payment[0]?.type?.toUpperCase() !== 'CASH'">Статус оплаты</th>
           <!-- <th *ngIf="['PAID', 'NOTIFIED', 'INTERNAL_ERROR', 'PROCESSING'].includes(order[0].payment[0]?.payload?.status || '') && order[0].payment[0]?.type !== 'CASH'">Отмена заказа</th> -->
           <th>Отмена заказа</th>
         </tr>
@@ -159,7 +159,7 @@
         <tr>
           <td>{{pay.summ}}</td>
           <td>{{pay.type | paymentType}}</td>
-          <td *ngIf="pay.type !== 'CASH'">{{pay?.payload?.status | paymentStatus}}</td>
+          <td *ngIf="pay?.type?.toUpperCase() !== 'CASH'">{{pay?.payload?.status | paymentStatus}}</td>
           <!-- <td *ngIf="['PAID', 'NOTIFIED', 'INTERNAL_ERROR', 'PROCESSING'].includes(order[0].payment[0]?.payload?.status || '') && order[0].payment[0]?.type !== 'CASH'"> -->
           <td>
             <button (click)="cancelOrder(pay.payload?.id)">Отменить</button>
diff --git a/src/app/pages/orders/orders.component.ts b/src/app/pages/orders/orders.component.ts
index 4f602be..853ef51 100644
--- a/src/app/pages/orders/orders.component.ts
+++ b/src/app/pages/orders/orders.component.ts
@@ -332,6 +332,9 @@ export class OrdersComponent implements OnInit {
       },
       error: (error) => {
         console.log('ERROR: ', error);
+        if(error?.error?.error?.code === 3){
+          return;
+        }
         this.messageService.add({
           severity: 'error',
           summary: 'Произошла ошибка!',
@@ -341,7 +344,7 @@ export class OrdersComponent implements OnInit {
   }
 
   cancelOrder(payment_request_id: string) {
-    if (this.order[0].payment[0]?.type === 'CASH') {
+    if (this.order[0].payment[0]?.type?.toUpperCase() === 'CASH' && !this.order[0].payment[0]?.payload?.id) {
       this.changeOrderStatus(this.order[0].id, 'cancel');
       return;
     }