Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Admin panel - Minor fix - Error message

KrzysztofPajak1bf6a58bbc68
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Edit.cshtml
index 9275b20c7..d76127442 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Edit.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Edit.cshtml
@@ -9,7 +9,8 @@
var canManageMessageQueue = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageMessageQueue);
}
<form asp-area="@Constants.AreaAdmin" asp-controller="Order" asp-action="Edit" method="post" id="order-form">
- <input type="hidden" asp-for="Id" />
+ <input type="hidden" asp-for="Id" />
+ <div asp-validation-summary="All"></div>
<div class="row">
<div class="col-md-12">
<div class="x_panel light form-fit">
@@ -136,7 +137,5 @@
</div>
</div>
</div>
- <div asp-validation-summary="All"></div>
-
</form>
<admin-delete-confirmation button-id="order-delete" />
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
index 625119df8..617d2b454 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
@@ -260,7 +260,7 @@ namespace Grand.Web.Admin.Controllers
if (!string.IsNullOrEmpty(customerGroupsError))
{
ModelState.AddModelError("", customerGroupsError);
- Error(customerGroupsError, false);
+ Error(customerGroupsError);
}
if (model.TwoFactorEnabled)
@@ -345,7 +345,7 @@ namespace Grand.Web.Admin.Controllers
if (!string.IsNullOrEmpty(customerGroupsError))
{
ModelState.AddModelError("", customerGroupsError);
- Error(customerGroupsError, false);
+ Error(customerGroupsError);
}
if (!string.IsNullOrWhiteSpace(model.Owner))
{
@@ -412,7 +412,7 @@ namespace Grand.Web.Admin.Controllers
}
catch (Exception exc)
{
- Error(exc.Message, false);
+ Error(exc.Message);
}
}
//If we got this far, something failed, redisplay form
diff --git a/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.cs b/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.cs
index 51df4ed6b..5730e25dd 100644
--- a/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.cs
@@ -148,7 +148,7 @@ namespace Grand.Web.Admin.Controllers
}
catch (Exception exc)
{
- Error(exc.Message, false);
+ Error(exc.Message);
}
//If we got this far, something failed, redisplay form
diff --git a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
index 0aadc3ae6..7337fdc96 100644
--- a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
@@ -679,7 +679,7 @@ namespace Grand.Web.Admin.Controllers
}
if (order.OrderStatusId == (int)OrderStatusSystem.Cancelled)
{
- Error("You can't edit position when order is canceled", true);
+ Error("You can't edit position when order is canceled");
return RedirectToAction("Edit", "Order", new { id = id });
}
@@ -700,13 +700,13 @@ namespace Grand.Web.Admin.Controllers
if (quantity == 0 || (orderItem.OpenQty != orderItem.Quantity && orderItem.IsShipEnabled))
{
- Error("You can't change quantity", true);
+ Error("You can't change quantity");
return RedirectToAction("Edit", "Order", new { id = id });
}
if (orderItem.Quantity == quantity && orderItem.UnitPriceExclTax == unitPriceExclTax)
{
- Error("Nothing has been changed", true);
+ Error("Nothing has been changed");
return RedirectToAction("Edit", "Order", new { id = id });
}
@@ -769,7 +769,7 @@ namespace Grand.Web.Admin.Controllers
var result = await _mediator.Send(new DeleteOrderItemCommand() { Order = order, OrderItem = orderItem });
if (result.error)
- Error(result.message, true);
+ Error(result.message);
//selected tab
await SaveSelectedTabIndex(persistForTheNextRequest: true);
@@ -808,7 +808,7 @@ namespace Grand.Web.Admin.Controllers
var result = await _mediator.Send(new CancelOrderItemCommand() { Order = order, OrderItem = orderItem });
if (result.error)
- Error(result.message, false);
+ Error(result.message);
else
Success("The order item was successfully canceled", true);
diff --git a/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs b/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs
index 553b14b6a..1ee37e883 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs
@@ -232,7 +232,7 @@ namespace Grand.Web.Admin.Controllers
var errors = await _mediator.Send(new CaptureCommand() { PaymentTransaction = paymentTransaction });
foreach (var error in errors)
- Error(error, false);
+ Error(error);
return RedirectToAction("Edit", "PaymentTransaction", new { id = id });
}
@@ -288,7 +288,8 @@ namespace Grand.Web.Admin.Controllers
{
var errors = await _mediator.Send(new RefundCommand() { PaymentTransaction = paymentTransaction });
foreach (var error in errors)
- Error(error, false);
+ Error(error);
+
return RedirectToAction("Edit", "PaymentTransaction", new { id = id });
}
catch (Exception exc)
@@ -342,7 +343,7 @@ namespace Grand.Web.Admin.Controllers
{
var errors = await _mediator.Send(new VoidCommand() { PaymentTransaction = paymentTransaction });
foreach (var error in errors)
- Error(error, false);
+ Error(error);
return RedirectToAction("Edit", "PaymentTransaction", new { id = id });
}
@@ -437,7 +438,8 @@ namespace Grand.Web.Admin.Controllers
}
//error
foreach (var error in errors)
- Error(error, false);
+ Error(error);
+
return View(model);
}
catch (Exception exc)