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 - allow staff owner to cancel the order

KrzysztofPajak8586c3aa1c19
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 7b57ca228..af67c147d 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
@@ -26,6 +26,10 @@
@if (!Model.IsLoggedInAsVendor)
{
<span id="order-delete" class="btn red"><i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]</span>
+ <a asp-action="CancelOrder" asp-route-id="@Model.Id" class="btn border-red" onclick="return confirm('@Loc["Admin.Common.AreYouSure"]');">
+ <i class="red fa fa-times-circle-o"></i>
+ @Loc["Admin.Common.Cancel"]
+ </a>
}
<input type="submit" id="btnRefreshPage" style="display: none" />
<script>
diff --git a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
index a5b385d18..bd0bd122b 100644
--- a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
@@ -246,7 +246,7 @@ namespace Grand.Web.Admin.Controllers
#region Payments and other order workflow
[PermissionAuthorizeAction(PermissionActionName.Cancel)]
- [HttpPost]
+ [HttpGet]
public async Task<IActionResult> CancelOrder(string id)
{
var order = await _orderService.GetOrderById(id);
@@ -262,21 +262,17 @@ namespace Grand.Web.Admin.Controllers
{
return RedirectToAction("List");
}
-
try
{
await _mediator.Send(new CancelOrderCommand() { Order = order, NotifyCustomer = true });
await _orderViewModelService.LogEditOrder(order.Id);
- var model = new OrderModel();
- await _orderViewModelService.PrepareOrderDetailsModel(model, order);
+ Success("Successfully canceled order");
return RedirectToAction("Edit", "Order", new { id = id });
}
catch (Exception exc)
{
//error
- var model = new OrderModel();
- await _orderViewModelService.PrepareOrderDetailsModel(model, order);
- Error(exc, false);
+ Error(exc, true);
return RedirectToAction("Edit", "Order", new { id = id });
}
}