Merge branch 'LabWork02Hard' into LabWork03Hard

CarpentryWorkshop/CarpentryWorkshop/FormShop.cs

@@ -63,7 +63,7 @@ namespace CarpentryWorkshopView
                     DataGridView.Rows.Clear();
                     foreach (var wood in _shopWoods)
                     {
-                        DataGridView.Rows.Add(new object[] { wood.Key, wood.Value.Item1.WoodName, wood.Value.Item2 });
+                        DataGridView.Rows.Add(new object[] { wood.Key, wood.Value.Item1.WoodName, wood.Value.Item1.Price,wood.Value.Item2 });
                     }
                 }
             }

CarpentryWorkshop/CarpentryWorkshopFileImplement/Implements/ShopStorage.cs

@@ -79,7 +79,11 @@ namespace CarpentryWorkshopFileImplement.Implements
 
         public bool CheckAvailability(int woodId, int count)
         {
-            int minus = source.Shops.Select(x => x.ShopWoods.Select(y => (y.Value.Item1.Id == woodId ? y.Value.Item2 : 0)).Sum()).Sum();
+			int minus = source.Shops
+                .SelectMany(shop => shop.ShopWoods
+				.Where(wood => wood.Value.Item1.Id == woodId)
+				.Select(wood => wood.Value.Item2))
+				.Sum(); 
             count -= minus;
             return count <= 0;
         }