diff --git a/InternetShop/InternetShopForms/InternetShopForms.csproj b/InternetShop/InternetShopForms/InternetShopForms.csproj
index bfc8ef2..64a09c3 100644
--- a/InternetShop/InternetShopForms/InternetShopForms.csproj
+++ b/InternetShop/InternetShopForms/InternetShopForms.csproj
@@ -15,7 +15,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/InternetShop/InternetShopForms/Orders/FormOrdersList.cs b/InternetShop/InternetShopForms/Orders/FormOrdersList.cs
index 2befcbc..9d91204 100644
--- a/InternetShop/InternetShopForms/Orders/FormOrdersList.cs
+++ b/InternetShop/InternetShopForms/Orders/FormOrdersList.cs
@@ -235,7 +235,12 @@ namespace InternetShopForms
"Товары",
};
- List columnWidths = [3.0f, 3.0f, 3.0f, 3.0f];
+ List<(float columnWidth, string headerRowCell1, string headerRowCell2, string property)> columnWidths =
+ [ (3.0f, "ID", "ID", "Id"),
+ (5.0f, "Личные данные", "ФИО", "CustomerFIO"),
+ (5.0f, "Личные данные", "Email", "CustomerEmail"),
+ (5.0f, "Товары", "Товары", "ProductsString"),
+ ];
var mergeColumns = new List<(int StartColumn, int EndColumn)> { (1, 2) };
@@ -252,9 +257,6 @@ namespace InternetShopForms
"Отчет по заказам",
mergeColumns,
columnWidths,
- headerRow1,
- headerRow2,
- columnPropertyMapping,
orders
);
MessageBox.Show("Отчет успешно сформирован", "Создание отчета", MessageBoxButtons.OK, MessageBoxIcon.Information);