From 4f873d25027e1785832d167e91214d4732b84faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=93=D0=BE=D1=80=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=B5=D0=B2?= <89176335310x@gmail.com>
Date: Sun, 19 May 2024 15:26:28 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=20=D0=B2=D1=81=D1=91=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BE=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SearchModels/OrderSearchModel.cs                     | 5 +++++
 .../ViewModels/OrderViewModel.cs                         | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ElectronicsShop/ElectronicsShopContracts/SearchModels/OrderSearchModel.cs b/ElectronicsShop/ElectronicsShopContracts/SearchModels/OrderSearchModel.cs
index 3fb2f40..974056e 100644
--- a/ElectronicsShop/ElectronicsShopContracts/SearchModels/OrderSearchModel.cs
+++ b/ElectronicsShop/ElectronicsShopContracts/SearchModels/OrderSearchModel.cs
@@ -1,4 +1,5 @@
 using ElectronicsShopDataModels.Enums;
+using ElectronicsShopDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,8 +11,12 @@ namespace ElectronicsShopContracts.SearchModels
     public class OrderSearchModel
     {
         public int? ID { get; set; }
+        //public int? OplataID { get; set; }
         public int? UserID { get; set; }
+        public OrderStatus OrderStatus { get; set; }
+        public PaymeantOption PaymeantOption { get; set; }
         public DateTime? DateFrom { get; set; }
         public DateTime? DateTo { get; set;}
+        public Dictionary<int, (IProductModel, int)>? ProductList { get; set; }
     }
 }
diff --git a/ElectronicsShop/ElectronicsShopContracts/ViewModels/OrderViewModel.cs b/ElectronicsShop/ElectronicsShopContracts/ViewModels/OrderViewModel.cs
index 3bd8874..6fbb140 100644
--- a/ElectronicsShop/ElectronicsShopContracts/ViewModels/OrderViewModel.cs
+++ b/ElectronicsShop/ElectronicsShopContracts/ViewModels/OrderViewModel.cs
@@ -14,12 +14,16 @@ namespace ElectronicsShopContracts.ViewModels
         public int ID { get; set; }
         [DisplayName("Клиент ID")]
         public int UserID { get; set; }
+        [DisplayName("Исполнитель ID")]
+        public int ImplementerID { get; set; }
+        [DisplayName("Оплата ID")]
+        public int PaymentID { get; set; }
 
         [DisplayName("Сумма")]
         public double Sum { get; set; }
 
         [DisplayName("Статус")]
-        public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
+        public OrderStatus OrderStatus { get; set; } = OrderStatus.Неизвестен;
 
         [DisplayName("Стутус оплаты")]
         public PaymeantOption PaymeantOption { get; set; } = PaymeantOption.Неизвестно;
@@ -29,7 +33,8 @@ namespace ElectronicsShopContracts.ViewModels
 
         [DisplayName("Дата выполнения")]
         public DateTime? DateImplement { get; set; }
-
+        [DisplayName("Корзина")]
         public Dictionary<int, (IProductModel, int)> ProductList { get; set; } = new();
+
     }
 }