ILRodionov/PIbd-21_Rodionov_I.A._IceCreamShop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-21. Rodionov I.A. Lab work 05. Hard #13

Closed
ILRodionov wants to merge 19 commits from lab5_hard into lab5_base
pull from: lab5_hard
merge into: ILRodionov:lab5_base
Conversation 0 Commits 19 Files Changed 138 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 69123995cd - Show all commits

2
IceCreamShop/IceCreamShopBusinessLogic/BusinessLogics/OrderLogic.cs
View File

@ -158,7 +158,7 @@ namespace IceCreamShopBusinessLogic.BusinessLogics
var shopList = _shopStorage.GetFullList();
int shopsCapacity = shopList.Sum(x => x.IceCreamsMaximum);
int currentIceCreams = shopList.Select(x => x.ShopIceCreams.Select(y => y.Value.Item2).Sum()).Sum();
int currentIceCreams = shopList.Select(x => x.ShopIceCreams.Sum(y => y.Value.Item2)).Sum();
int freePlaces = shopsCapacity - currentIceCreams;
if (freePlaces < count)

2
IceCreamShop/IceCreamShopFileImplement/Implements/ShopStorage.cs
View File

@ -113,7 +113,7 @@ namespace IceCreamShopFileImplement.Implements
}
shop.Update(new ShopBindingModel
{
Id = model.Id,
Id = shop.Id,
ShopName = shop.ShopName,
Address = shop.Address,
DateOpening = shop.DateOpening,