From 9800f035f9f022a08bc965cde4fb888f3f65d428 Mon Sep 17 00:00:00 2001
From: gofnnp <fbicha1234@gmail.com>
Date: Thu, 19 Jan 2023 22:17:36 +0400
Subject: [PATCH] =?UTF-8?q?dev=20#13584=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB?=
 =?UTF-8?q?=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=B8=D0=B5,=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D0=B2=D0=B5=D0=BB=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/orders/orders.component.html | 2 +-
 src/app/pages/orders/orders.component.ts   | 2 +-
 src/environments/environment.ts            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/orders/orders.component.html b/src/app/pages/orders/orders.component.html
index fd3bfd5..dc8e2af 100644
--- a/src/app/pages/orders/orders.component.html
+++ b/src/app/pages/orders/orders.component.html
@@ -160,7 +160,7 @@
         </tr>
         <tr>
           <th>{{sumRef}}</th>
-          <th><button [disabled]="dis == true || this.order[0].status == 'newOrder' || this.order[0].status == 'cancel' || this.order[0].status == 'paymentOverdue'" (click)="confirm(order[0].external_id, order[0].payment[0].type, order[0].id)">Отменить</button></th>
+          <th><button (click)="confirm(order[0].external_id, order[0].payment[0].type, order[0].id)">Отменить</button></th>
           <!--<th><button [disabled]="order[0].payment[0].summ == sumRef || pay == false || this.order[0].payment == []" (click)="confirm(order[0].external_id, order[0].payment[0].payload.id)">Возврат ДС</button></th>-->
           <!--<th><button disabled>Возврат ДС</button></th>-->
         </tr>
diff --git a/src/app/pages/orders/orders.component.ts b/src/app/pages/orders/orders.component.ts
index 6955d23..665e908 100644
--- a/src/app/pages/orders/orders.component.ts
+++ b/src/app/pages/orders/orders.component.ts
@@ -287,7 +287,7 @@ notif2() {
                   console.log('ERROR: ', err)
                   this.messageService.add({
                     severity: 'error',
-                    summary: 'Произошла ошибка!',
+                    summary: `Произошла ошибка! ${err.error.error.message}`,
                   })
                 }
               }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 59c0e63..d69e879 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,7 +4,7 @@
 
 export const environment = {
   production: false,
-  appSelfDeliveryEndPoint: 'http://selfdelivery-pitsburg.mydatahosting.ru/admin_api',
+  appSelfDeliveryEndPoint: 'http://localhost:4200/api',
   systemId: 'dfe16ca16a3598b812',
 };