diff --git a/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs b/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs index 0725eec..1c1d0a6 100644 --- a/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs +++ b/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs @@ -6,5 +6,6 @@ string ClientFIO { get; } string ClientEmail { get; } string ClientPassword { get; } + } } \ No newline at end of file diff --git a/BeautySalonView/BeautySalonDatabaseImplement/Models/Order.cs b/BeautySalonView/BeautySalonDatabaseImplement/Models/Order.cs index 7b921d6..f9fc9bd 100644 --- a/BeautySalonView/BeautySalonDatabaseImplement/Models/Order.cs +++ b/BeautySalonView/BeautySalonDatabaseImplement/Models/Order.cs @@ -55,12 +55,26 @@ namespace BeautySalonDatabaseImplement.Models } } + public List OrderCosmetics + { + get + { + _orderCosmetics ??= Cosmetic + .Select(pc => new OrderCosmeticViewModel(pc.Cosmetic.GetViewModel, pc.OrderCosmeticCount)) + .ToList(); + return _orderCosmetics; + } + } + // связь услуги и заказов многие - ко - многим [ForeignKey("OrderId")] public virtual List Services { get; set; } = new(); [ForeignKey("OrderId")] - public virtual List Procedures { get; set; } = new(); + public virtual List Cosmetics { get; set; } = new(); + + [ForeignKey("OrderId")] + public virtual List Procedures { get; set; } = new(); public static Order Create(BeautySalonDatabase context, OrderBindingModel model) {