From 154ca083016e98d08b38bbaf236dbe6152fb21c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F?= <Илья@WIN-RANNDDD>
Date: Sat, 18 May 2024 18:19:17 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BE=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B1=D0=BA=D0=B8,=20=D0=B2=D0=BE=D0=B7=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BA=D1=88=D0=B8=D0=B5=20=D0=B8=D0=B7-=D0=B7=D0=B0=20=D1=81?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=8F=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessLogics/OrderLogic.cs              |  5 ++--
 .../IceCreamShopView/FormMain.designer.cs     | 25 ++++++++-----------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/IceCreamShop/IceCreamShopBusinessLogic/BusinessLogics/OrderLogic.cs b/IceCreamShop/IceCreamShopBusinessLogic/BusinessLogics/OrderLogic.cs
index 1915f6c..c7b158d 100644
--- a/IceCreamShop/IceCreamShopBusinessLogic/BusinessLogics/OrderLogic.cs
+++ b/IceCreamShop/IceCreamShopBusinessLogic/BusinessLogics/OrderLogic.cs
@@ -21,11 +21,10 @@ namespace IceCreamShopBusinessLogic.BusinessLogics
 
         private readonly IShopLogic _shopLogic;
 
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IIceCreamStorage iceCreamStorage, 
-            IShopStorage shopStorage, IShopLogic shopLogic)
         static readonly object locker = new();
 
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IIceCreamStorage iceCreamStorage,
+            IShopStorage shopStorage, IShopLogic shopLogic)
         {
             _logger = logger;
             _orderStorage = orderStorage;
diff --git a/IceCreamShop/IceCreamShopView/FormMain.designer.cs b/IceCreamShop/IceCreamShopView/FormMain.designer.cs
index c156563..63021da 100644
--- a/IceCreamShop/IceCreamShopView/FormMain.designer.cs
+++ b/IceCreamShop/IceCreamShopView/FormMain.designer.cs
@@ -32,8 +32,8 @@
             справочникиToolStripMenuItem = new ToolStripMenuItem();
             компонентыToolStripMenuItem = new ToolStripMenuItem();
             мороженоеToolStripMenuItem = new ToolStripMenuItem();
-            магазиныToolStripMenuItem = new ToolStripMenuItem();
             клиентыToolStripMenuItem = new ToolStripMenuItem();
+            магазиныToolStripMenuItem = new ToolStripMenuItem();
             исполнителиToolStripMenuItem = new ToolStripMenuItem();
             отчетыToolStripMenuItem = new ToolStripMenuItem();
             списокМороженогоToolStripMenuItem = new ToolStripMenuItem();
@@ -55,8 +55,7 @@
             // 
             // menuStrip
             // 
-            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, пополнениеМагазинаToolStripMenuItem, продажаМороженогоToolStripMenuItem });
-            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem });
+            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem, пополнениеМагазинаToolStripMenuItem, продажаМороженогоToolStripMenuItem });
             menuStrip.Location = new Point(0, 0);
             menuStrip.Name = "menuStrip";
             menuStrip.Padding = new Padding(7, 2, 0, 2);
@@ -66,8 +65,7 @@
             // 
             // справочникиToolStripMenuItem
             // 
-            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, мороженоеToolStripMenuItem, клиентыToolStripMenuItem, магазиныToolStripMenuItem });
-            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, мороженоеToolStripMenuItem, клиентыToolStripMenuItem, исполнителиToolStripMenuItem });
+            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, мороженоеToolStripMenuItem, клиентыToolStripMenuItem, исполнителиToolStripMenuItem, магазиныToolStripMenuItem });
             справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
             справочникиToolStripMenuItem.Size = new Size(94, 20);
             справочникиToolStripMenuItem.Text = "Справочники";
@@ -75,7 +73,6 @@
             // компонентыToolStripMenuItem
             // 
             компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
-            компонентыToolStripMenuItem.Size = new Size(145, 22);
             компонентыToolStripMenuItem.Size = new Size(149, 22);
             компонентыToolStripMenuItem.Text = "Компоненты";
             компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
@@ -83,26 +80,24 @@
             // мороженоеToolStripMenuItem
             // 
             мороженоеToolStripMenuItem.Name = "мороженоеToolStripMenuItem";
-            мороженоеToolStripMenuItem.Size = new Size(145, 22);
             мороженоеToolStripMenuItem.Size = new Size(149, 22);
             мороженоеToolStripMenuItem.Text = "Мороженое";
             мороженоеToolStripMenuItem.Click += МороженоеToolStripMenuItem_Click;
             // 
-            // магазиныToolStripMenuItem
-            // 
-            магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
-            магазиныToolStripMenuItem.Size = new Size(145, 22);
-            магазиныToolStripMenuItem.Text = "Магазины";
-            магазиныToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click;
-            // 
             // клиентыToolStripMenuItem
             // 
             клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
-            клиентыToolStripMenuItem.Size = new Size(145, 22);
             клиентыToolStripMenuItem.Size = new Size(149, 22);
             клиентыToolStripMenuItem.Text = "Клиенты";
             клиентыToolStripMenuItem.Click += КлиентыToolStripMenuItem_Click;
             // 
+            // магазиныToolStripMenuItem
+            // 
+            магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+            магазиныToolStripMenuItem.Size = new Size(149, 22);
+            магазиныToolStripMenuItem.Text = "Магазины";
+            магазиныToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click;
+            // 
             // исполнителиToolStripMenuItem
             // 
             исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";