From acc917538169e11ff0283d8a1591ca3ca0d6fe61 Mon Sep 17 00:00:00 2001
From: gofnnp <fbicha1234@gmail.com>
Date: Sun, 5 Feb 2023 19:13:56 +0400
Subject: [PATCH] =?UTF-8?q?dev=20#13716=20=D0=92=D1=8B=D0=B2=D0=B5=D0=BB?=
 =?UTF-8?q?=20=D1=82=D0=B8=D0=BF=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/data/data.ts                       | 7 +++++++
 src/app/interface/data.ts                  | 1 +
 src/app/pages/orders/orders.component.html | 4 ++++
 src/app/pages/orders/orders.component.ts   | 6 ++++++
 4 files changed, 18 insertions(+)
 create mode 100644 src/app/data/data.ts

diff --git a/src/app/data/data.ts b/src/app/data/data.ts
new file mode 100644
index 0000000..31ebdf4
--- /dev/null
+++ b/src/app/data/data.ts
@@ -0,0 +1,7 @@
+export const OrderTypes = {
+    "mobileApp": "Мобильное приложение",
+    "offlineReline": "Кассовое приложение",
+    "mobileAppOfflineOrder": "Диплинк",
+    "selfServiceTerminalOrder": "Терминал самообслуживания",
+    "notFound": "Тип не найден"
+}
\ No newline at end of file
diff --git a/src/app/interface/data.ts b/src/app/interface/data.ts
index 7e8045e..b73a43c 100644
--- a/src/app/interface/data.ts
+++ b/src/app/interface/data.ts
@@ -63,6 +63,7 @@ export interface Order {
   status_h: string;
   item_style: string;
   isWarnLine: boolean;
+  type: string;
 }
 
 export interface Client {
diff --git a/src/app/pages/orders/orders.component.html b/src/app/pages/orders/orders.component.html
index dc8e2af..7bc3821 100644
--- a/src/app/pages/orders/orders.component.html
+++ b/src/app/pages/orders/orders.component.html
@@ -20,6 +20,7 @@
         <th>Внешний ID заказа</th>
         <th>Телефон клиента</th>
         <th>Тип оплаты</th>
+        <th>Тип заказа</th>
       </tr>
       <tr style="position:sticky !important; top: 55px">
         <th><p-columnFilter type="text" field="id" [matchModeOptions]="matchModeOptions" [matchMode]="'custom-contains'"></p-columnFilter></th>
@@ -43,6 +44,7 @@
         <td>{{order.external_id}}</td>
         <td>{{order.phone}}</td>
         <td *ngIf="order.payment[0]; else nd">{{order.payment[0].type}}</td>
+        <td>{{orderTypes[leadToTypeOrderType(order.type)]}}</td>
       </tr>
     </ng-template>
     <ng-template #nd>
@@ -62,6 +64,7 @@
           <th>Дата создания</th>
           <th>ID точки заказа</th>
           <th>Статус</th>
+          <th>Тип заказа</th>
         </tr>
       </ng-template>
       <ng-template pTemplate="body" let-ord>
@@ -89,6 +92,7 @@
               <option>Напечатан</option>
             </select>
           </td>
+          <td>{{orderTypes[leadToTypeOrderType(ord.type)]}}</td>
         </tr>
       </ng-template>
     </p-table>
diff --git a/src/app/pages/orders/orders.component.ts b/src/app/pages/orders/orders.component.ts
index 665e908..e97ad54 100644
--- a/src/app/pages/orders/orders.component.ts
+++ b/src/app/pages/orders/orders.component.ts
@@ -6,6 +6,7 @@ import { Order, Products, Delivery_address, Notification, Refund } from "src/app
 import { ClientsComponent } from "../clients/clients.component";
 import { ToastModule } from 'primeng/toast';
 import { ConfirmationService, FilterService, FilterMatchMode, SelectItem } from 'primeng/api';
+import { OrderTypes } from "src/app/data/data";
 /*import { SwPush, NewsletterService } from '@angular/service-worker*/
 
 
@@ -36,6 +37,7 @@ export class OrdersComponent implements OnInit {
   public sumRef3: any = 0;
   public matchModeOptions!: SelectItem[];
   public dis: boolean = false;
+  public readonly orderTypes = OrderTypes
 
 
   public statuses = [
@@ -398,4 +400,8 @@ notif2() {
     }
 
   }
+
+  leadToTypeOrderType(str: any) {
+    return str as keyof typeof this.orderTypes
+  }
 }