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.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
feat(arch001): add Edit + payment action buttons region to BasePaymentTransactionController
KrzysztofPajak512620ba2214
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BasePaymentTransactionControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BasePaymentTransactionControllerTests.csindex a3130cc2e..6b072024f 100644--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BasePaymentTransactionControllerTests.cs+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BasePaymentTransactionControllerTests.cs@@ -1,3 +1,4 @@+using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Payments;using Grand.Business.Core.Interfaces.Common.Directory;@@ -134,4 +135,58 @@ public class BasePaymentTransactionControllerTestsAssert.AreEqual("Edit", result.ActionName);Assert.AreEqual("pt-1", result.RouteValues["id"]);}++ [TestMethod]+ public async Task Edit_DeniedByScope_RedirectsToList()+ {+ _paymentTransactionServiceMock.Setup(s => s.GetById("pt-1")).ReturnsAsync(new PaymentTransaction { Id = "pt-1" });+ _scopeMock.Setup(s => s.HasAccess(It.IsAny<PaymentTransaction>())).ReturnsAsync(false);++ var result = await _controller.Edit("pt-1") as RedirectToActionResult;++ Assert.IsNotNull(result);+ Assert.AreEqual("List", result.ActionName);+ }++ [TestMethod]+ public async Task Edit_Authorized_ReturnsViewWithModel()+ {+ var transaction = new PaymentTransaction { Id = "pt-1", OrderGuid = Guid.NewGuid(), TransactionAmount = 100, RefundedAmount = 20, PaidAmount = 100 };+ _paymentTransactionServiceMock.Setup(s => s.GetById("pt-1")).ReturnsAsync(transaction);+ _orderServiceMock.Setup(s => s.GetOrderByGuid(transaction.OrderGuid)).ReturnsAsync(new Order { Id = "order-1", OrderNumber = 42 });++ var result = await _controller.Edit("pt-1") as ViewResult;++ Assert.IsNotNull(result);+ var model = result.Model as PaymentTransactionModel;+ Assert.IsNotNull(model);+ Assert.AreEqual("pt-1", model.Id);+ Assert.AreEqual(80, model.MaxAmountToRefund);+ }++ [TestMethod]+ public async Task CapturePaymentTransaction_DeniedByScope_RedirectsToList()+ {+ _paymentTransactionServiceMock.Setup(s => s.GetById("pt-1")).ReturnsAsync(new PaymentTransaction { Id = "pt-1" });+ _scopeMock.Setup(s => s.HasAccess(It.IsAny<PaymentTransaction>())).ReturnsAsync(false);++ var result = await _controller.CapturePaymentTransaction("pt-1") as RedirectToActionResult;++ Assert.IsNotNull(result);+ Assert.AreEqual("List", result.ActionName);+ }++ [TestMethod]+ public async Task CapturePaymentTransaction_Authorized_SendsCaptureCommandAndRedirectsToEdit()+ {+ var transaction = new PaymentTransaction { Id = "pt-1" };+ _paymentTransactionServiceMock.Setup(s => s.GetById("pt-1")).ReturnsAsync(transaction);+ _mediatorMock.Setup(m => m.Send(It.IsAny<CaptureCommand>(), default)).ReturnsAsync(new List<string>());++ var result = await _controller.CapturePaymentTransaction("pt-1") as RedirectToActionResult;++ Assert.IsNotNull(result);+ Assert.AreEqual("Edit", result.ActionName);+ Assert.AreEqual("pt-1", result.RouteValues["id"]);+ }}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BasePaymentTransactionController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BasePaymentTransactionController.csindex e172e3d04..992edcad7 100644--- a/src/Web/Grand.Web.AdminShared/Controllers/BasePaymentTransactionController.cs+++ b/src/Web/Grand.Web.AdminShared/Controllers/BasePaymentTransactionController.cs@@ -1,7 +1,9 @@+using Grand.Business.Core.Commands.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Payments;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Queries.Checkout.Orders;using Grand.Domain.Payments;using Grand.Domain.Permissions;using Grand.Mediator;@@ -164,4 +166,177 @@ public abstract class BasePaymentTransactionController(}#endregion++ #region Edit++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> Edit(string id)+ {+ var (paymentTransaction, denied) = await LoadAuthorizedPaymentTransaction(id);+ if (denied != null) return denied;++ var order = await orderService.GetOrderByGuid(paymentTransaction.OrderGuid);++ var model = new PaymentTransactionModel {+ Id = paymentTransaction.Id,+ OrderCode = paymentTransaction.OrderCode,+ CustomerEmail = string.IsNullOrEmpty(paymentTransaction.CustomerEmail)+ ? "(null)"+ : paymentTransaction.CustomerEmail,+ CustomerId = paymentTransaction.CustomerId,+ CurrencyCode = paymentTransaction.CurrencyCode,+ TransactionAmount = paymentTransaction.TransactionAmount,+ PaidAmount = paymentTransaction.PaidAmount,+ PaymentMethodSystemName = paymentTransaction.PaymentMethodSystemName,+ RefundedAmount = paymentTransaction.RefundedAmount,+ OrderId = order?.Id,+ OrderNumber = order?.OrderNumber,+ CreatedOn = dateTimeService.ConvertToUserTime(paymentTransaction.CreatedOnUtc, DateTimeKind.Utc),+ TransactionStatus = paymentTransaction.TransactionStatus,+ Status = enumTranslationService.GetTranslationEnum(paymentTransaction.TransactionStatus),+ IPAddress = paymentTransaction.IPAddress,+ Description = paymentTransaction.Description,+ AdditionalInfo = paymentTransaction.AdditionalInfo,+ AuthorizationTransactionId = paymentTransaction.AuthorizationTransactionId,+ CanCapture = await mediator.Send(new CanCaptureQuery { PaymentTransaction = paymentTransaction }),+ CanMarkAsPaid = await mediator.Send(new CanMarkPaymentTransactionAsPaidQuery { PaymentTransaction = paymentTransaction }),+ CanRefund = await mediator.Send(new CanRefundQuery { PaymentTransaction = paymentTransaction }),+ CanRefundOffline = await mediator.Send(new CanRefundOfflineQuery { PaymentTransaction = paymentTransaction }),+ CanPartiallyRefund = await mediator.Send(new CanPartiallyRefundQuery { PaymentTransaction = paymentTransaction, AmountToRefund = 0 }),+ CanPartiallyRefundOffline = await mediator.Send(new CanPartiallyRefundOfflineQuery { PaymentTransaction = paymentTransaction, AmountToRefund = 0 }),+ CanPartiallyPaidOffline = await mediator.Send(new CanPartiallyPaidOfflineQuery { PaymentTransaction = paymentTransaction, AmountToPaid = 0 }),+ CanVoid = await mediator.Send(new CanVoidQuery { PaymentTransaction = paymentTransaction }),+ CanVoidOffline = await mediator.Send(new CanVoidOfflineQuery { PaymentTransaction = paymentTransaction }),+ MaxAmountToRefund = paymentTransaction.TransactionAmount - paymentTransaction.RefundedAmount,+ MaxAmountToPaid = paymentTransaction.TransactionAmount - paymentTransaction.PaidAmount+ };++ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> CapturePaymentTransaction(string id)+ {+ var (paymentTransaction, denied) = await LoadAuthorizedPaymentTransaction(id);+ if (denied != null) return denied;++ try+ {+ var errors = await mediator.Send(new CaptureCommand { PaymentTransaction = paymentTransaction });++ foreach (var error in errors)+ Error(error);++ return RedirectToAction("Edit", "PaymentTransaction", new { id });+ }+ catch (Exception exc)+ {+ Error(exc, false);+ return RedirectToAction("Edit", "PaymentTransaction", new { id });+ }+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> MarkPaymentTransactionAsPaid(string id)+ {+ var (paymentTransaction, denied) = await LoadAuthorizedPaymentTransaction(id);+ if (denied != null) return denied;++ try+ {+ await mediator.Send(new MarkAsPaidCommand { PaymentTransaction = paymentTransaction });+ return RedirectToAction("Edit", "PaymentTransaction", new { id });+ }+ catch (Exception exc)+ {+ Error(exc, false);+ return RedirectToAction("Edit", "PaymentTransaction", new { id });+ }+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> RefundPaymentTransaction(string id)+ {+ var (paymentTransaction, denied) = await LoadAuthorizedPaymentTransaction(id);+ if (denied != null) return denied;++ try+ {+ var errors = await mediator.Send(new RefundCommand { PaymentTransaction = paymentTransaction });+ foreach (var error in errors)+ Error(error);++ return RedirectToAction("Edit", "PaymentTransaction", new { id });+ }+ catch (Exception exc)+ {+ Error(exc, false);+ return RedirectToAction("Edit", "PaymentTransaction", new { id });+ }+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> RefundPaymentTransactionOffline(string id)+ {+ var (paymentTransaction, denied) = await LoadAuthorizedPaymentTransaction(id);+ if (denied != null) return denied;++ try+ {+ await mediator.Send(new RefundOfflineCommand { PaymentTransaction = paymentTransaction });+ return RedirectToAction("Edit", "PaymentTransaction", new { id });+ }+ catch (Exception exc)+ {+ Error(exc, false);+ return RedirectToAction("Edit", "PaymentTransaction", new { id });+ }+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> VoidPaymentTransaction(string id)+ {+ var (paymentTransaction, denied) = await LoadAuthorizedPaymentTransaction(id);+ if (denied != null) return denied;++ try+ {+ var errors = await mediator.Send(new VoidCommand { PaymentTransaction = paymentTransaction });+ foreach (var error in errors)+ Error(error);++ return RedirectToAction("Edit", "PaymentTransaction", new { id });+ }+ catch (Exception exc)+ {+ Error(exc, false);+ return RedirectToAction("Edit", "PaymentTransaction", new { id });+ }+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> VoidPaymentTransactionOffline(string id)+ {+ var (paymentTransaction, denied) = await LoadAuthorizedPaymentTransaction(id);+ if (denied != null) return denied;++ try+ {+ await mediator.Send(new VoidOfflineCommand { PaymentTransaction = paymentTransaction });+ return RedirectToAction("Edit", "PaymentTransaction", new { id });+ }+ catch (Exception exc)+ {+ Error(exc, false);+ return RedirectToAction("Edit", "PaymentTransaction", new { id });+ }+ }++ #endregion}