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? 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 ProductList { get; set; } = new(); + } }