From 17691184e9466e85964b8f763c8eaf333fa298d1 Mon Sep 17 00:00:00 2001
From: gofnnp <fbicha1234@gmail.com>
Date: Thu, 13 Apr 2023 21:59:04 +0400
Subject: [PATCH] =?UTF-8?q?dev=20#14073=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=BB=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=87=D0=BA=D0=B8=20(=D0=BF=D1=80=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=BE=20=D0=BC=D0=B5=D0=BD=D1=8F=D0=B5=D1=82=20=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D1=82=D1=83=D1=81=20=D0=BD=D0=B0=20=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/orders/orders.component.html | 7 +++++--
 src/app/pages/orders/orders.component.ts   | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/orders/orders.component.html b/src/app/pages/orders/orders.component.html
index b5613ea..201c266 100644
--- a/src/app/pages/orders/orders.component.html
+++ b/src/app/pages/orders/orders.component.html
@@ -93,6 +93,7 @@
               <option>Новый</option>
               <option>Выдан</option>
               <option>Напечатан чек</option>
+              <option>Отменен</option>
             </select>
             <button (click)="saveStatus(ord.id)" [disabled]="!selectedStatus.length">Сохранить</button>
           </td>
@@ -150,7 +151,8 @@
           <th>Сумма оплаты</th>
           <th>Тип оплаты</th>
           <th *ngIf="order[0].payment[0]?.type !== 'CASH'">Статус оплаты</th>
-          <th *ngIf="['PAID', 'NOTIFIED', 'INTERNAL_ERROR', 'PROCESSING'].includes(order[0].payment[0]?.payload?.status || '') && order[0].payment[0]?.type !== '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>
       </ng-template>
       <ng-template pTemplate="body" let-pay>
@@ -158,7 +160,8 @@
           <td>{{pay.summ}}</td>
           <td>{{pay.type | paymentType}}</td>
           <td *ngIf="pay.type !== '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 *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>
           </td>
         </tr>
diff --git a/src/app/pages/orders/orders.component.ts b/src/app/pages/orders/orders.component.ts
index e1df3b6..0c447c8 100644
--- a/src/app/pages/orders/orders.component.ts
+++ b/src/app/pages/orders/orders.component.ts
@@ -343,6 +343,10 @@ export class OrdersComponent implements OnInit {
   }
 
   cancelOrder(payment_request_id: string) {
+    if (this.order[0].payment[0]?.type === 'CASH') {
+      this.changeOrderStatus(this.order[0].id, 'cancel');
+      return;
+    }
     this.jsonRpcService
       .rpc2(
         {