diff --git a/ProjectCompanyFurniture/ProjectCompanyFurniture/Entities/Invoice.cs b/ProjectCompanyFurniture/ProjectCompanyFurniture/Entities/Invoice.cs index 7034b3c..063a75f 100644 --- a/ProjectCompanyFurniture/ProjectCompanyFurniture/Entities/Invoice.cs +++ b/ProjectCompanyFurniture/ProjectCompanyFurniture/Entities/Invoice.cs @@ -19,7 +19,7 @@ public class Invoice public int SellingPrice { get; set; } - DateTime Data { get; set; } + public DateTime Date { get; set; } public IEnumerable Products { @@ -37,7 +37,7 @@ public class Invoice AvailabilityOfPromotionalCode = availabilityOfPromotionalCode, DiscountPercentage = discountPercentage, SellingPrice = sellingPrice, - Data = DateTime.Now, + Date = DateTime.Now, Products = products }; } diff --git a/ProjectCompanyFurniture/ProjectCompanyFurniture/Entities/ProductMovement.cs b/ProjectCompanyFurniture/ProjectCompanyFurniture/Entities/ProductMovement.cs index cba9cff..add15c2 100644 --- a/ProjectCompanyFurniture/ProjectCompanyFurniture/Entities/ProductMovement.cs +++ b/ProjectCompanyFurniture/ProjectCompanyFurniture/Entities/ProductMovement.cs @@ -13,17 +13,17 @@ public class ProductMovement public int ProductID { get; private set; } - public Movement MovementProduct { get; private set; } + public Movement MovementType { get; private set; } public DateTime Date { get; private set; } - public static ProductMovement CreateOperation (int it, int productId, Movement movement) + public static ProductMovement CreateOperation (int it, int productId, Movement movementType) { return new ProductMovement { ID = it, ProductID = productId, - MovementProduct = movement, + MovementType = movementType, Date = DateTime.Now }; } diff --git a/ProjectCompanyFurniture/ProjectCompanyFurniture/Forms/FormInvoice.cs b/ProjectCompanyFurniture/ProjectCompanyFurniture/Forms/FormInvoice.cs index 9711f53..a001695 100644 --- a/ProjectCompanyFurniture/ProjectCompanyFurniture/Forms/FormInvoice.cs +++ b/ProjectCompanyFurniture/ProjectCompanyFurniture/Forms/FormInvoice.cs @@ -24,12 +24,12 @@ namespace ProjectCompanyFurniture.Forms throw new ArgumentNullException(nameof(invoiceRepository)); comboBoxClient.DataSource = clientRepository.ReadClients(); - comboBoxClient.DisplayMember = "FirstName"; - comboBoxClient.ValueMember = "Id"; + comboBoxClient.DisplayMember = "Name"; + comboBoxClient.ValueMember = "ID"; ColumnProduct.DataSource = productRepository.ReadProducts(); ColumnProduct.DisplayMember = "Name"; - ColumnProduct.ValueMember = "Id"; + ColumnProduct.ValueMember = "ID"; } private void ButtonSave_Click(object sender, EventArgs e) diff --git a/ProjectCompanyFurniture/ProjectCompanyFurniture/Forms/FormProducts.cs b/ProjectCompanyFurniture/ProjectCompanyFurniture/Forms/FormProducts.cs index 3f37393..b20d13e 100644 --- a/ProjectCompanyFurniture/ProjectCompanyFurniture/Forms/FormProducts.cs +++ b/ProjectCompanyFurniture/ProjectCompanyFurniture/Forms/FormProducts.cs @@ -59,7 +59,7 @@ namespace ProjectCompanyFurniture.Forms } try { - var form = _container.Resolve(); + var form = _container.Resolve(); form.Id = findId; form.ShowDialog(); LoadList();