diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportClientLogic.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportClientLogic.cs index 0e75c5e..bbdb826 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportClientLogic.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportClientLogic.cs @@ -55,7 +55,9 @@ namespace ElectronicsShopBusinessLogic.BusinessLogic ProductName = product.Value.Item1.ProductName, Price = product.Value.Item1.Price, CostItemName = _costItemStorage.GetElement(new CostItemSearchModel { ID = product.Value.Item1.CostItemID })?.Name - ?? "Отсутствует" + ?? "Отсутствует", + PaymentID = paymeant.ID, + count = product.Value.Item2 }); } } diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToPdfClient.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToPdfClient.cs index 5da6dab..dcad8dc 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToPdfClient.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToPdfClient.cs @@ -25,63 +25,47 @@ namespace ElectronicsShopBusinessLogic.OfficePackage alignmentType = PdfParagraphAlignmentType.Right }); - CreateTable(new List { "2cm", "6cm", "4cm", "6cm" }); - //ТУТ КОСТЫЛЬ КАК взять номер заказа, в info его нема - CreateRow(new PdfRowParameters - { - Text = new List {$"Заказ номер: Костыль " }, - Style = "NormalTittle", - alignmentType = PdfParagraphAlignmentType.Center, - }); - int StringsEnum = 0; - - CreateRow(new PdfRowParameters - { - Text = new List { "Номер", "Товар", "Цена", "Статья затрат" }, - Style = "NormalTittle", - alignmentType = PdfParagraphAlignmentType.Center, - }); - - foreach (var products in info.Products) - { - if (products.ID == 1 && StringsEnum != 0) - { - // Криво считает сумму - CreateParagraph(new PdfParagraph - { - Text = $"Итого: {info.Products.Sum(x => x.Price)}\t", - Style = "Normal", - alignmentType = PdfParagraphAlignmentType.Right - }); - - CreateTable(new List { "2cm", "6cm", "4cm", "6cm" }); - //ТУТ КОСТЫЛЬ КАК взять номер заказа, в info его нема - CreateRow(new PdfRowParameters - { - Text = new List { $"Заказ номер: Костыль " }, - Style = "NormalTittle", - alignmentType = PdfParagraphAlignmentType.Center, - }); + List PaymentsID = new List(); + foreach (var pr in info.Products) { + int id = pr.PaymentID; + if (PaymentsID.Contains(id) == false) { + PaymentsID.Add(id); } + } - CreateRow(new PdfRowParameters - { - Text = new List { products.ID.ToString(), products.ProductName.ToString(), products.Price.ToString(), - products.CostItemName.ToString()}, + foreach (int id in PaymentsID) { + CreateParagraph(new PdfParagraph { + Text = $"Номер оплаты: {id}", Style = "Normal", alignmentType = PdfParagraphAlignmentType.Left, - }); - StringsEnum++; + CreateTable(new List { "2cm", "4cm", "2cm", "2cm", "4cm" }); - } - // Криво считает сумму - CreateParagraph(new PdfParagraph { - Text = $"Итого: {info.Products.Sum(x => x.Price)}\t", - Style = "Normal", - alignmentType = PdfParagraphAlignmentType.Right - }); + CreateRow(new PdfRowParameters { + Text = new List { "Номер товара", "Товар", "Цена", "Количество", "Статья затрат" }, + Style = "NormalTittle", + alignmentType = PdfParagraphAlignmentType.Center, + }); + double sum = 0; + foreach (var products in info.Products) { + if (products.PaymentID == id) { + sum += products.Price * products.count; + CreateRow(new PdfRowParameters { + Text = new List { products.ID.ToString(), products.ProductName.ToString(), + (products.Price * products.count).ToString(), products.count.ToString() ,products.CostItemName.ToString()}, + Style = "Normal", + alignmentType = PdfParagraphAlignmentType.Left, + }); + } + } + CreateParagraph(new PdfParagraph { + Text = $"Итого: {sum}\t", + Style = "Normal", + alignmentType = PdfParagraphAlignmentType.Right + }); + } + var document = SavePdf(info); return document; } diff --git a/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportProductsViewModel.cs b/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportProductsViewModel.cs index 1d05b7b..2e9083e 100644 --- a/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportProductsViewModel.cs +++ b/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportProductsViewModel.cs @@ -12,6 +12,8 @@ namespace ElectronicsShopContracts.ViewModels public int ID { get; set; } public string ProductName { get; set; } = string.Empty; public double Price { get; set; } + public int count { get; set; } public string CostItemName { get; set; } = string.Empty; + public int PaymentID { get; set; } } }