diff --git a/ConfectionaryFileImplement/OrderStorage.cs b/ConfectionaryFileImplement/OrderStorage.cs index aae2076..c2dc788 100644 --- a/ConfectionaryFileImplement/OrderStorage.cs +++ b/ConfectionaryFileImplement/OrderStorage.cs @@ -63,14 +63,14 @@ namespace ConfectioneryFileImplement public OrderViewModel? Update(OrderBindingModel model) { - var pastry = _source.Orders.FirstOrDefault(x => x.Id == model.Id); - if (pastry == null) + var order = _source.Orders.FirstOrDefault(x => x.Id == model.Id); + if (order == null) { return null; } - pastry.Update(model); + order.Update(model); _source.SaveOrders(); - return pastry.GetViewModel; + return order.GetViewModel; } } } diff --git a/ConfectionaryFileImplement/Pastry.cs b/ConfectionaryFileImplement/Pastry.cs index f32067c..6138c0c 100644 --- a/ConfectionaryFileImplement/Pastry.cs +++ b/ConfectionaryFileImplement/Pastry.cs @@ -1,7 +1,6 @@ using ConfectioneryContracts.BindingModels; using ConfectioneryContracts.ViewModels; using ConfectioneryDataModels.Models; -using ConfectioneryDataModels.Models; using System.Xml.Linq; namespace ConfectioneryFileImplement.Models diff --git a/Confectionery/FormCreateOrder.Designer.cs b/Confectionery/FormCreateOrder.Designer.cs index 7047902..ab9a95b 100644 --- a/Confectionery/FormCreateOrder.Designer.cs +++ b/Confectionery/FormCreateOrder.Designer.cs @@ -103,7 +103,7 @@ this.textBoxCount.Name = "textBoxCount"; this.textBoxCount.Size = new System.Drawing.Size(214, 23); this.textBoxCount.TabIndex = 6; - this.textBoxCount.Click += new System.EventHandler(this.TextBoxCount_TextChanged); + this.textBoxCount.ValueChanged += new System.EventHandler(this.TextBoxCount_TextChanged); // // textBoxSum // diff --git a/Confectionery/FormCreateOrder.cs b/Confectionery/FormCreateOrder.cs index 47cd686..01b08ad 100644 --- a/Confectionery/FormCreateOrder.cs +++ b/Confectionery/FormCreateOrder.cs @@ -39,8 +39,7 @@ namespace ConfectioneryView } private void CalcSum() { - if (comboBoxPastry.SelectedValue != null && - !string.IsNullOrEmpty(textBoxCount.Text)) + if (comboBoxPastry.SelectedValue != null && !string.IsNullOrEmpty(textBoxCount.Text)) { try { @@ -49,9 +48,8 @@ namespace ConfectioneryView { Id = id }); - int count = Convert.ToInt32(textBoxCount.Text); - textBoxSum.Text = Math.Round(count * (pastry?.Price ?? 0), - 2).ToString(); + int count = Convert.ToInt32(textBoxCount.Value); + textBoxSum.Text = Math.Round(count * (pastry?.Price ?? 0), 2).ToString(); _logger.LogInformation("Расчет суммы заказа"); } catch (Exception ex)