diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs index 9e5b755..8cca808 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs @@ -8,6 +8,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels public string Title { get; set; } = string.Empty; - public List Products { get; set; } = new(); + public List Products { get; set; } = new(); } } diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoClient.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoClient.cs index 101c841..d1d2430 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoClient.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoClient.cs @@ -9,6 +9,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels public string Title { get; set; } = string.Empty; - public List ListPaymeant { get; set; } = new(); + public List ListPaymeant { get; set; } = new(); } } diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs index ff98c64..5956264 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs @@ -9,6 +9,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels public string Title { get; set; } = string.Empty; - public List ListProduct { get; set; } = new(); + public List ListProduct { get; set; } = new(); } } diff --git a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs index 4132e7f..7e439a4 100644 --- a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs +++ b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs @@ -10,8 +10,8 @@ namespace ElectronicsShopContracts.BusinessLogicContracts { public interface IReportClientLogic { - List GetPaymeants(ReportPaymeantBindingModel model); - void SavePreservesToWordFile(ReportPaymeantBindingModel model); - void SavePreservesToExcelFile(ReportPaymeantBindingModel model); + List GetPaymeants(ReportBindingModel model); + void SavePaymeantToWordFile(ReportBindingModel model); + void SavePaymeantToExcelFile(ReportBindingModel model); } } diff --git a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs index 4f58760..c584ce6 100644 --- a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs +++ b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs @@ -10,8 +10,8 @@ namespace ElectronicsShopContracts.BusinessLogicContracts { public interface IReportEmployeeLogic { - List GetRoute(ReportProductBindingModel model); - void SaveRoutesToWordFile(ReportProductBindingModel model); - void SaveRoutesToExcelFile(ReportProductBindingModel model); + List GetProduct(ReportProductBindingModel model); + void SaveProductsToWordFile(ReportProductBindingModel model); + void SaveProductsToExcelFile(ReportProductBindingModel model); } } diff --git a/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs b/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs index dca6f74..0c8a943 100644 --- a/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs +++ b/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs @@ -1,4 +1,5 @@ -using System; +using ElectronicsShopDataModels.Enums; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,7 +9,12 @@ namespace ElectronicsShopContracts.ViewModels { public class ReportPaymeantsViewModel { - public string PaymeantName { get; set; } = string.Empty; - public List PaymeantsList { get; set; } = new(); - } + public int PaymeantID { get; set; } + + public int ProductID { get; set; } + + public int OrderID { get; set; } + public double SumPayment { get; set; } + public PaymeantOption PayOption { get; set; } = PaymeantOption.Неоплачено; + } } diff --git a/ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/Report.cshtml b/ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/Report.cshtml new file mode 100644 index 0000000..596e149 --- /dev/null +++ b/ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/Report.cshtml @@ -0,0 +1,36 @@ +@{ + ViewData["Title"] = "Report"; +} + + + +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +