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 @@
-

Заказ: {{order[0].id}}

+

Заказ: {{order[0]?.id}}

@@ -150,7 +150,7 @@ Сумма оплаты Тип оплаты - Статус оплаты + Статус оплаты Отмена заказа @@ -159,7 +159,7 @@ {{pay.summ}} {{pay.type | paymentType}} - {{pay?.payload?.status | paymentStatus}} + {{pay?.payload?.status | paymentStatus}} 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; }