From 49b9a58b2e17853c1adb861a0153bf4ed76b088b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=A4=D0=B5=D0=B4=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2?= <ilf.for.programming@gmail.com>
Date: Sat, 1 Jun 2024 02:45:59 +0400
Subject: [PATCH] Product Edit/Del is done

---
 ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs   | 2 +-
 .../ElectronicsShopShopClientApp/Controllers/HomeController.cs | 3 +++
 .../ElectronicsShopShopClientApp/Views/Home/EditOrder.cshtml   | 1 +
 .../ElectronicsShopShopClientApp/Views/Home/OrderView.cshtml   | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs b/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs
index 247925f..2830f99 100644
--- a/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs
+++ b/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs
@@ -12,7 +12,7 @@ namespace ElectronicsShopDataBaseImplement
        optionsBuilder)
         {
 			if (optionsBuilder.IsConfigured == false) {
-				optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-E2VPEN3\SQLEXPRESS;Initial Catalog=ElectronicsShopDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+				optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-O0N00SH\SQLEXPRESS;Initial Catalog=ElectronicsShopDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
 			}
 			base.OnConfiguring(optionsBuilder);
 		}
diff --git a/ElectronicsShop/ElectronicsShopShopClientApp/Controllers/HomeController.cs b/ElectronicsShop/ElectronicsShopShopClientApp/Controllers/HomeController.cs
index 03a2567..6d253d5 100644
--- a/ElectronicsShop/ElectronicsShopShopClientApp/Controllers/HomeController.cs
+++ b/ElectronicsShop/ElectronicsShopShopClientApp/Controllers/HomeController.cs
@@ -134,6 +134,9 @@ namespace ElectronicsShopUserApp.Controllers {
 				return Redirect("~/Home/Enter");
 			}
 
+            if (id == 0) {
+                return Redirect("Orders");
+            }
 			var products = APIClient.GetRequset<List<List<string>>>($"api/main/getorderproducts?_orderid={id}");
 
 			foreach (var pr in products) {
diff --git a/ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/EditOrder.cshtml b/ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/EditOrder.cshtml
index 43543be..0e523e9 100644
--- a/ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/EditOrder.cshtml
+++ b/ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/EditOrder.cshtml
@@ -76,6 +76,7 @@
 			<div class="col-4"></div>
 			<div class="col-8">
 				<input type="submit" value="Заказ готова, вернуться!" class="btn btn-primary" />
+				<a class="btn btn-primary btn-sm" asp-action="DeleteOrder" asp-route-ID="@Model.Item1">Удалить</a>
 			</div>
 		</div>
 	</div>
diff --git a/ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/OrderView.cshtml b/ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/OrderView.cshtml
index 01445ea..b8f6b52 100644
--- a/ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/OrderView.cshtml
+++ b/ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/OrderView.cshtml
@@ -70,12 +70,14 @@
 							</td>
 					</tr>
 				}
+
 			</tbody>
 		</table>
 		<div class="row">
 			<div class="col-4"></div>
 			<div class="col-8">
 				<input type="submit" value="Заказ готова, вернуться!" class="btn btn-primary" />
+				<a class="btn btn-primary btn-sm" asp-action="DeleteOrder" asp-route-ID="@Model.Item1">Отменить создание корзины</a>
 			</div>
 		</div>
 	</div>