From b8268cb6b61eb9310fc7c83f9fc5191e0f40cd42 Mon Sep 17 00:00:00 2001
From: Allllen4a <a30122004z@gmail.com>
Date: Tue, 30 Apr 2024 13:44:55 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BeautySalonDatabaseImplement/Models/Cosmetic.cs          | 5 +----
 .../BeautySalonDatabaseImplement/Models/OrderCosmetic.cs     | 5 ++---
 .../BeautySalonDatabaseImplement/Models/Order_.cs            | 5 -----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/BeautySalonView/BeautySalonDatabaseImplement/Models/Cosmetic.cs b/BeautySalonView/BeautySalonDatabaseImplement/Models/Cosmetic.cs
index db373ac..3b85b7e 100644
--- a/BeautySalonView/BeautySalonDatabaseImplement/Models/Cosmetic.cs
+++ b/BeautySalonView/BeautySalonDatabaseImplement/Models/Cosmetic.cs
@@ -27,11 +27,8 @@ namespace BeautySalonDatabaseImplement.Models
         public virtual LaborCosts LaborCost { get; set; }
 
         [ForeignKey("CosmeticId")]
-<<<<<<< HEAD
-        public virtual List<ProcedureCosmetic> Procedures { get; set; } = new();
-=======
+
         public virtual List<CosmeticProcedure> Procedures { get; set; } = new();
->>>>>>> подправила заказ
 
         [ForeignKey("CosmeticId")]
         public virtual List<ServiceCosmetic> Services { get; set; } = new();
diff --git a/BeautySalonView/BeautySalonDatabaseImplement/Models/OrderCosmetic.cs b/BeautySalonView/BeautySalonDatabaseImplement/Models/OrderCosmetic.cs
index a55128f..b25fedb 100644
--- a/BeautySalonView/BeautySalonDatabaseImplement/Models/OrderCosmetic.cs
+++ b/BeautySalonView/BeautySalonDatabaseImplement/Models/OrderCosmetic.cs
@@ -17,12 +17,11 @@ namespace BeautySalonDatabaseImplement.Models
         [Required]
         public int CosmeticId { get; set; }
 
-<<<<<<< HEAD
-=======
+
         [Required]
         public int OrderCosmeticCount { get; set; }
 
->>>>>>> подправила заказ
+
         public virtual Order_ Order { get; set; } = new();
 
         public virtual Cosmetic Cosmetic { get; set; } = new();
diff --git a/BeautySalonView/BeautySalonDatabaseImplement/Models/Order_.cs b/BeautySalonView/BeautySalonDatabaseImplement/Models/Order_.cs
index 5060adb..8f0c362 100644
--- a/BeautySalonView/BeautySalonDatabaseImplement/Models/Order_.cs
+++ b/BeautySalonView/BeautySalonDatabaseImplement/Models/Order_.cs
@@ -59,13 +59,8 @@ namespace BeautySalonDatabaseImplement.Models
         {
             get
             {
-<<<<<<< HEAD:BeautySalonView/BeautySalonDatabaseImplement/Models/Order_.cs
-                _orderCosmetics ??= Cosmetic
-                    .Select(pc => new OrderCosmeticViewModel(pc.Cosmetic.GetViewModel))
-=======
                 _orderCosmetics ??= Cosmetics
                     .Select(pc => new OrderCosmeticViewModel(pc.Cosmetic.GetViewModel, pc.OrderCosmeticCount))
->>>>>>> подправила заказ:BeautySalonView/BeautySalonDatabaseImplement/Models/Order.cs
                     .ToList();
                 return _orderCosmetics;
             }