diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportEmployeeLogic.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportEmployeeLogic.cs index eccea73..8283213 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportEmployeeLogic.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportEmployeeLogic.cs @@ -45,17 +45,39 @@ namespace ElectronicsShopBusinessLogic.BusinessLogic foreach (var paymeant in paymeants) { var order = _orderStorage.GetElement(new OrderSearchModel { ID = paymeant.OrderID }) ?? throw new Exception("Ошибка получения данных"); foreach (var product in order.ProductList) { - paymeantProductList.Add(new(paymeant.ID, product.Key, product.Value.Item2)); + paymeantProductList.Add(new(paymeant.ID, product.Key, product.Value.Item2, paymeant.ClientID)); } } - paymeantProductList.OrderBy(x => x.ProductID); + return CreateProducntInPaymenatList(paymeantProductList); + } + + public List GetProductsFix(List products) { + var paymeants = _paymeantStorage.GetFullList(); + List paymeantProducts = new(); + + foreach (var paymeant in paymeants) { + var order = _orderStorage.GetElement(new OrderSearchModel { ID = paymeant.ID }) ?? throw new Exception("Ошибка получения данных"); + foreach (var product in order.ProductList) { + foreach (var fixProduct in products) { + if (product.Value.Item1.ID == fixProduct.ID) { + paymeantProducts.Add(new(paymeant.ID, product.Key, product.Value.Item2, paymeant.ClientID)); + } + } + } + } + + return CreateProducntInPaymenatList(paymeantProducts); + } + + public List CreateProducntInPaymenatList(List paymeantProducts) { + paymeantProducts.OrderBy(x => x.ProductID); List ansProductsList = new(); List productNames = new(); - foreach (var pp in paymeantProductList) { - var product = _productStorage.GetElement(new ProductSearchModel { ID = pp.ProductID}) + foreach (var pp in paymeantProducts) { + var product = _productStorage.GetElement(new ProductSearchModel { ID = pp.ProductID }) ?? throw new Exception("Ошибка получения данных"); if (productNames.Contains(product.ProductName) == false) { productNames.Add(product.ProductName); @@ -72,24 +94,22 @@ namespace ElectronicsShopBusinessLogic.BusinessLogic // Ищем запись и вносим изменения int index = ansProductsList.IndexOf(ansProductsList.First(x => x.ProductName == product.ProductName)); - var paymeant = _paymeantStorage.GetElement(new PaymeantSearchModel { ID = pp.PaymeantID }) + var paymeant = _paymeantStorage.GetElement(new PaymeantSearchModel { ID = pp.PaymeantID }) ?? throw new Exception("Ошибка получения данных"); - ansProductsList[index].Values.Add(new(pp.PaymeantID, pp.Count, paymeant.PayOption.ToString(), product.Price * pp.Count)); + ansProductsList[index].Values.Add(new(pp.PaymeantID, pp.Count, paymeant.PayOption.ToString(), product.Price * pp.Count, pp.ClientID)); ansProductsList[index].Total++; } - return ansProductsList; - } + return ansProductsList; + } - public byte[]? SaveProductsToExcelFile(ReportProductBindingModel model) + public byte[]? SaveProductsToExcelFile(List products) { var document = _saveToExcel.CreateReport(new ExcelInfoEmployee { Title = "Список оплат электротоваров", - ListProduct = GetProducts(model), - DateTo = model.DateTo, - DateFrom = model.DateFrom + ListProduct = GetProductsFix(products) }); return document; } @@ -106,13 +126,11 @@ namespace ElectronicsShopBusinessLogic.BusinessLogic return document; } - public byte[]? SaveProductsToWordFile(ReportProductBindingModel model) + public byte[]? SaveProductsToWordFile(List products) { var document = _saveToWord.CreateDoc(new WordInfoEmployee { Title = "Список оплат электротоваров", - ListProduct = GetProducts(model), - DateFrom = model.DateFrom, - DateTo = model.DateTo, + ListProduct = GetProductsFix(products) }); return document; } diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelEmployee.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelEmployee.cs index ce3dc86..74001c2 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelEmployee.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelEmployee.cs @@ -23,19 +23,7 @@ namespace ElectronicsShopBusinessLogic.OfficePackage CellToName = "C1" }); - InsertCellInWorksheet(new ExcelCellParameters { - ColumnName = "A", - RowIndex = 2, - Text = $"С {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", - StyleInfo = ExcelStyleInfoType.Title - }); - - MergeCells(new ExcelMergeParameters { - CellFromName = "A2", - CellToName = "K2" - }); - - uint rowIndex = 3; + uint rowIndex = 2; foreach (var product in info.ListProduct) { InsertCellInWorksheet(new ExcelCellParameters { ColumnName = "A", @@ -135,7 +123,47 @@ namespace ElectronicsShopBusinessLogic.OfficePackage CellFromName = $"J{rowIndex}", CellToName = $"K{rowIndex}" }); - rowIndex++; + + InsertCellInWorksheet(new ExcelCellParameters { + ColumnName = "L", + RowIndex = rowIndex, + Text = "Сумма:", + StyleInfo = ExcelStyleInfoType.TextWithBroder + }); + + InsertCellInWorksheet(new ExcelCellParameters { + ColumnName = "M", + RowIndex = rowIndex, + Text = paymeant.ProductSum.ToString(), + StyleInfo = ExcelStyleInfoType.TextWithBroder + }); + + InsertCellInWorksheet(new ExcelCellParameters { + ColumnName = "N", + RowIndex = rowIndex, + Text = "ID Клиента:", + StyleInfo = ExcelStyleInfoType.TextWithBroder + }); + + InsertCellInWorksheet(new ExcelCellParameters { + ColumnName = "O", + RowIndex = rowIndex, + StyleInfo = ExcelStyleInfoType.TextWithBroder + }); + + + MergeCells(new ExcelMergeParameters { + CellFromName = $"N{rowIndex}", + CellToName = $"O{rowIndex}" + }); + + InsertCellInWorksheet(new ExcelCellParameters { + ColumnName = "P", + RowIndex = rowIndex, + Text = paymeant.ClientID.ToString(), + StyleInfo = ExcelStyleInfoType.TextWithBroder + }); + rowIndex++; } InsertCellInWorksheet(new ExcelCellParameters { ColumnName = "A", diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToPdfEmployee.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToPdfEmployee.cs index b477da6..f870ee0 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToPdfEmployee.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToPdfEmployee.cs @@ -29,10 +29,10 @@ namespace ElectronicsShopBusinessLogic.OfficePackage { Style = "Normal", alignmentType = PdfParagraphAlignmentType.Left, }); - CreateTable(new List { "2cm", "4cm", "4cm", "4cm" }); + CreateTable(new List { "2cm", "4cm", "4cm", "4cm", "2cm" }); CreateRow(new PdfRowParameters { - Text = new List { "Оплата №", "Статус", "Количество товара", "Сумма" }, + Text = new List { "Оплата №", "Статус", "Количество товара", "Сумма", "ID Клиента" }, Style = "NormalTittle", alignmentType = PdfParagraphAlignmentType.Center, }); @@ -43,7 +43,8 @@ namespace ElectronicsShopBusinessLogic.OfficePackage { paymeant.PaymeantID.ToString(), paymeant.PaymeantStatus.ToString(), paymeant.ProducCount.ToString(), - paymeant.ProductSum.ToString() + paymeant.ProductSum.ToString(), + paymeant.ClientID.ToString(), }, Style = "Normal", alignmentType= PdfParagraphAlignmentType.Left, diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToWordEmployee.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToWordEmployee.cs index 3e87bb0..88a6fe9 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToWordEmployee.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToWordEmployee.cs @@ -24,15 +24,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage } }); - CreateParagraph(new WordParagraph { - Texts = new List<(string, WordTextProperties)> { ($"С {info.DateFrom} по {info.DateTo}", new WordTextProperties { Bold = true, Size = "24", }) }, - TextProperties = new WordTextProperties { - Size = "24", - JustificationType = WordJustificationType.Both - } - }); - - foreach (var data in info.ListProduct) { CreateParagraph(new WordParagraph { Texts = new List<(string, WordTextProperties)> { (data.ProductName, new WordTextProperties { Bold = true, Size = "24", }) }, @@ -43,7 +34,8 @@ namespace ElectronicsShopBusinessLogic.OfficePackage }); foreach (var paymeant in data.Values) { CreateParagraph(new WordParagraph { - Texts = new List<(string, WordTextProperties)> { ($"Оплата №:{paymeant.PaymeantID} статус:{paymeant.PaymeantStatus}", + Texts = new List<(string, WordTextProperties)> { ($"Оплата №:{paymeant.PaymeantID}/В количестве:{paymeant.ProducCount}/" + + $"Cтатус:{paymeant.PaymeantStatus}/Сумма:{paymeant.ProductSum}/ID Клиента:{paymeant.ClientID}", new WordTextProperties { Bold = false, Size = "24", }) }, TextProperties = new WordTextProperties { Size = "24", diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoClient.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoClient.cs index 79ab583..de16634 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoClient.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoClient.cs @@ -6,10 +6,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels { public string Title { get; set; } = string.Empty; - public DateTime DateFrom { get; set; } - - public DateTime DateTo { get; set; } - public List PaymeantProducts { get; set; } = new(); } } diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs index 3de5a24..2f5ff9e 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs @@ -6,9 +6,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels { public string Title { get; set; } = string.Empty; - public DateTime DateFrom { get; set; } - public DateTime DateTo { get; set; } - public List ListProduct { get; set; } = new(); } } diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/PaymeantProduct.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/PaymeantProduct.cs index 48bc2d0..3f07560 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/PaymeantProduct.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/PaymeantProduct.cs @@ -8,13 +8,16 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels { public class PaymeantProduct { public int PaymeantID { get; set; } public int ProductID { get; set; } + + public int ClientID { get; set; } // количество товара в оплате public int Count { get; set; } - public PaymeantProduct(int paymeantID, int productID, int count) { + public PaymeantProduct(int paymeantID, int productID, int count, int clientID) { PaymeantID = paymeantID; ProductID = productID; - Count = count; + ClientID = clientID; + Count = count; } } } diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoClient.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoClient.cs index 5fbaaf0..c45f676 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoClient.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoClient.cs @@ -7,10 +7,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels { public string Title { get; set; } = string.Empty; - public DateTime DateFrom { get; set; } - - public DateTime DateTo { get; set; } - public List? Products { get; set; } = new(); } } diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs index 47d8550..d872337 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs @@ -7,9 +7,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels { public string Title { get; set; } = string.Empty; - public DateTime DateFrom { get; set; } - public DateTime DateTo { get; set; } - public List ListProduct { get; set; } = new(); } } diff --git a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs index 6b301a7..4255c94 100644 --- a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs +++ b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs @@ -12,8 +12,11 @@ namespace ElectronicsShopContracts.BusinessLogicContracts public interface IReportEmployeeLogic { List GetProducts(ReportProductBindingModel model); - byte[]? SaveProductsToWordFile(ReportProductBindingModel model); - byte[]? SaveProductsToExcelFile(ReportProductBindingModel model); + + List GetProductsFix(List products); + + byte[]? SaveProductsToWordFile(List products); + byte[]? SaveProductsToExcelFile(List products); PdfDocument SaveProductsToPdfFile(ReportProductBindingModel model); } } diff --git a/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportProductInPaymeantsViewModel.cs b/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportProductInPaymeantsViewModel.cs index 94ff28d..bd9e48e 100644 --- a/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportProductInPaymeantsViewModel.cs +++ b/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportProductInPaymeantsViewModel.cs @@ -8,7 +8,7 @@ namespace ElectronicsShopContracts.ViewModels { public class ReportProductInPaymeantsViewModel { public string ProductName { get; set; } = string.Empty; - public List<(int PaymeantID, int ProducCount, string PaymeantStatus, double ProductSum)> Values = new(); + public List<(int PaymeantID, int ProducCount, string PaymeantStatus, double ProductSum, int ClientID)> Values = new(); // Итоговое количество оплат public int Total { get; set; } diff --git a/ElectronicsShop/ElectronicsShopEmployeeApp/Controllers/HomeController.cs b/ElectronicsShop/ElectronicsShopEmployeeApp/Controllers/HomeController.cs index 6997e89..090da9a 100644 --- a/ElectronicsShop/ElectronicsShopEmployeeApp/Controllers/HomeController.cs +++ b/ElectronicsShop/ElectronicsShopEmployeeApp/Controllers/HomeController.cs @@ -3,6 +3,7 @@ using ElectronicsShopContracts.BindingModels; using ElectronicsShopContracts.SearchModels; using ElectronicsShopContracts.ViewModels; using ElectronicsShopEmployeeApp.Models; +using Microsoft.AspNetCore.Http.Extensions; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; using System.Diagnostics; @@ -322,7 +323,7 @@ namespace ElectronicsShopEmployeeApp.Controllers { return Redirect("/Home/Index"); } - return View(); + return View(APIEmployee.GetRequset>($"api/main/getproducts")); } [HttpPost] @@ -343,8 +344,31 @@ namespace ElectronicsShopEmployeeApp.Controllers { } [HttpGet] - public IActionResult CreateWordReport(string DateFrom, string DateTo) { - var fileMemStream = APIEmployee.GetRequset($"api/Employee/CreateDocxReport?from={DateFrom}&to={DateTo}"); + public IActionResult ReportSearchFix() { + string strUrl = Request.GetDisplayUrl(); + strUrl = strUrl.Replace("https://localhost:7221/Home/ReportSearchFix/", ""); + + string ids = ""; + List productsFix = new(); + foreach (char i in strUrl) { + if (int.TryParse(i.ToString(), out int id)) { + var product = APIEmployee.GetRequset($"api/main/getproduct?_productid={id}") ?? throw new Exception(" "); + productsFix.Add(product); + ids += "/" + id; + } + } + + if (string.IsNullOrEmpty(ids)) { + throw new Exception(" "); + } + + (List, string) tuple = (productsFix, ids); + return View(tuple); + } + + [HttpGet] + public IActionResult CreateWordReport(string ids) { + var fileMemStream = APIEmployee.GetRequset($"api/Employee/CreateDocxReport?_ids={ids}"); if (fileMemStream == null) { throw new Exception(" "); @@ -354,8 +378,8 @@ namespace ElectronicsShopEmployeeApp.Controllers { } [HttpGet] - public IActionResult CreateExcelReport(string DateFrom, string DateTo) { - var fileMemStream = APIEmployee.GetRequset($"api/Employee/CreateXlsxReport?from={DateFrom}&to={DateTo}"); + public IActionResult CreateExcelReport(string ids) { + var fileMemStream = APIEmployee.GetRequset($"api/Employee/CreateXlsxReport?_ids={ids}"); if (fileMemStream == null) { throw new Exception(" "); diff --git a/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/Index.cshtml b/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/Index.cshtml index be0c00e..3849d0b 100644 --- a/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/Index.cshtml +++ b/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/Index.cshtml @@ -41,20 +41,20 @@ @foreach (var item in Model) { - @Html.DisplayFor(modelItem => item.ID) + @Html.DisplayFor(modelItem => item.ID) - @Html.DisplayFor(modelItem => item.ProductName) + @Html.DisplayFor(modelItem => item.ProductName) - @Html.DisplayFor(modelItem => item.CostItemName) + @Html.DisplayFor(modelItem => item.CostItemName) - @Html.DisplayFor(modelItem => item.Price) + @Html.DisplayFor(modelItem => item.Price) - Изменить - Удалить + Изменить + Удалить } diff --git a/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/Report.cshtml b/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/Report.cshtml index bc3cf26..f9a2ec1 100644 --- a/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/Report.cshtml +++ b/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/Report.cshtml @@ -1,9 +1,19 @@ -@{ +@using ElectronicsShopContracts.ViewModels +@model List + +@{ ViewData["Title"] = "Report"; } + +
-

Отчёты

+

Отчеты

+ +
+

Отчёт за период

+
+
@@ -20,7 +30,107 @@
-
+
-
\ No newline at end of file + + +
+

Выбрать товары в отечет

+
+ +
+ @{ + if (Model == null) { +

Авторизируйтесь

+ return; + } +
+ +
+ + + + + + + + + + + + + + @foreach (var item in Model) { + + + + + + + + + } + +
+ Номер товара + + Наименование товара + + Стоимость + + Номер статьи затрат + + Наименование статьи затрат + + Выбрать все +
+ @Html.DisplayFor(modelItem => item.ID) + + @Html.DisplayFor(modelItem => item.ProductName) + + @Html.DisplayFor(modelItem => item.Price) + + @Html.DisplayFor(modelItem => item.CostItemID) + + @Html.DisplayFor(modelItem => item.CostItemName) + + +
+ } +
+ + \ No newline at end of file diff --git a/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/ReportSearch.cshtml b/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/ReportSearch.cshtml index 1cab1e1..4425b36 100644 --- a/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/ReportSearch.cshtml +++ b/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/ReportSearch.cshtml @@ -9,7 +9,7 @@

- +
@@ -24,11 +24,7 @@
-
- Экспорт отчета в .docx - Экспорт отчета в .xlsx +
отправить на Email отчет в .pdf
@@ -57,6 +53,9 @@ Дата оплаты + + ID Клиента + @@ -77,6 +76,9 @@ @Html.DisplayFor(modelItem => item.DatePaymeant) + + @Html.DisplayFor(modelItem => item.ClientID) + } diff --git a/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/ReportSearchFix.cshtml b/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/ReportSearchFix.cshtml new file mode 100644 index 0000000..00f97b5 --- /dev/null +++ b/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/ReportSearchFix.cshtml @@ -0,0 +1,69 @@ +@using ElectronicsShopContracts.ViewModels +@model (List, string) + +@{ + ViewData["Title"] = "ReportSearchFix"; +} + +
+

+
+ +
+
+ Экспорт отчета в .docx + Экспорт отчета в .xlsx +
+

+
+ +
+ @{ + if (Model.Item1 == null) { +

Авторизируйтесь

+ return; + } + + + + + + + + + + + + @foreach (var item in Model.Item1) { + + + + + + + + } + +
+ Номер товара + + Наименование товара + + Стоимость + + Номер статьи затрат + + Наименование статьи затрат +
+ @Html.DisplayFor(modelItem => item.ID) + + @Html.DisplayFor(modelItem => item.ProductName) + + @Html.DisplayFor(modelItem => item.Price) + + @Html.DisplayFor(modelItem => item.CostItemID) + + @Html.DisplayFor(modelItem => item.CostItemName) +
+ } +
\ No newline at end of file diff --git a/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Shared/_Layout.cshtml b/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Shared/_Layout.cshtml index c4ac0dd..7795b5e 100644 --- a/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Shared/_Layout.cshtml +++ b/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Shared/_Layout.cshtml @@ -10,9 +10,9 @@
-
@@ -118,7 +118,6 @@ }); $('#btnFix').on('click', function () { - debugger let val = []; $("input[name='Select_rec']:checked").each(function () { val.push($(this).val());