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 - fix delete selected orders

KrzysztofPajakc0c104312f3b
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/List.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/List.cshtml
index 5e806cde4..d4ed935bf 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/List.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/List.cshtml
@@ -42,7 +42,7 @@
<i class="fa fa-file-pdf-o"></i>
@Loc["Admin.Orders.PdfInvoice.Selected"]
</button>
- <button type="button" name="delete-selected" id="delete-selected" class="btn red" onclick=" return confirm('@Loc["Admin.Common.AreYouSure"]'); ">
+ <button type="button" name="delete-selected" id="delete-selected" class="btn red">
<i class="fa fa-trash-o"></i>
@Loc["Admin.Common.Delete.Selected"]
</button>
@@ -427,29 +427,28 @@
});
$('#delete-selected').click(function(e) {
-
- e.preventDefault();
-
- var postData = {
- selectedIds: selectedIds
- };
- addAntiForgeryToken(postData);
-
- $.ajax({
- cache: false,
- type: "POST",
- url: "@(Url.Action("DeleteSelected", "Order", new { area = Constants.AreaAdmin }))",
- data: postData,
- complete: function(data) {
- //reload grid
- var grid = $('#orders-grid').data('kendoGrid');
- grid.dataSource.read();
- },
- error: function(xhr, ajaxOptions, thrownError) {
- alert(thrownError);
- },
- traditional: true
- });
+ if (confirm('@Loc["Admin.Common.AreYouSure"]')) {
+
+ var postData = {
+ selectedIds: selectedIds
+ };
+ addAntiForgeryToken(postData);
+ $.ajax({
+ cache: false,
+ type: "POST",
+ url: "@(Url.Action("DeleteSelected", "Order", new { area = Constants.AreaAdmin }))",
+ data: postData,
+ complete: function (data) {
+ //reload grid
+ var grid = $('#orders-grid').data('kendoGrid');
+ grid.dataSource.read();
+ },
+ error: function (xhr, ajaxOptions, thrownError) {
+ alert(thrownError);
+ },
+ traditional: true
+ });
+ }
return false;
});
diff --git a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
index bd0bd122b..3167f95d3 100644
--- a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
@@ -441,7 +441,7 @@ namespace Grand.Web.Admin.Controllers
if (shipments.Any())
Error("Some orders is in associated with shipments. Please delete it first.");
- if (await CheckSalesManager(order) && !shipments.Any())
+ if (!shipments.Any())
{
await _mediator.Send(new DeleteOrderCommand() { Order = order });
await customerActivityService.InsertActivity("DeleteOrder", order.Id, _translationService.GetResource("ActivityLog.DeleteOrder"), order.Id);