Andrey_Abazov/PIbd-23_Abazov_A.A._Confectionery
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Abazov A. A. LabWork02_Hard #10

Closed
Andrey_Abazov wants to merge 6 commits from LabWork02_Hard into LabWork01_Hard
pull from: LabWork02_Hard
merge into: Andrey_Abazov:LabWork01_Hard
Conversation 1 Commits 6 Files Changed 30 +4 -4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ee4962b0d5 - Show all commits

1
.gitignore vendored
View File

@ -398,3 +398,4 @@ FodyWeavers.xsd
# JetBrains Rider
*.sln.iml
/Confectionery/ImplementationExtensions

2
Confectionery/Confectionery/FormSell.cs
View File

@ -52,7 +52,7 @@ namespace Confectionery
bool operationResult = _logicS.Sell(Convert.ToInt32(comboBoxPastry.SelectedValue), count);
if (!operationResult)
{
throw new Exception("Ошибка при создании поставки. Дополнительная информация в логах.");
throw new Exception("Ошибка при создании списания. Дополнительная информация в логах.");
}
MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
DialogResult = DialogResult.OK;

5
Confectionery/ConfectioneryFileImplements/Implements/ShopStorage.cs
View File

@ -115,15 +115,14 @@ namespace ConfectioneryFileImplement.Implements
}
else
{
int dif = count - freeShopSpace;
count -= freeShopSpace;
if (shop.Pastries.TryGetValue(pastryId, out var pastryCount))
{
shop.Pastries[pastryId] = pastryCount + count;
shop.Pastries[pastryId] = pastryCount + freeShopSpace;
}
else
{
shop.Pastries.Add(pastryId, count);
shop.Pastries.Add(pastryId, freeShopSpace);
}
shop.setShopPastriesNull();
}