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): cut Admin/Store PaymentTransactionController over to thin subclasses
KrzysztofPajak7f2c7a3c5913
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/PaymentTransactionControllerRoutingTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/PaymentTransactionControllerRoutingTests.csnew file mode 100644index 000000000..eb8774f5b--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/PaymentTransactionControllerRoutingTests.cs@@ -0,0 +1,19 @@+using Grand.Web.Admin.Controllers;+using Grand.Web.AdminShared.Controllers;+using Microsoft.VisualStudio.TestTools.UnitTesting;++namespace Grand.Web.Admin.Tests.Controllers;++[TestClass]+public class PaymentTransactionControllerRoutingTests+{+ [TestMethod]+ public void AdminPaymentTransactionController_InheritsBasePaymentTransactionController() =>+ Assert.IsTrue(typeof(BasePaymentTransactionController).IsAssignableFrom(typeof(PaymentTransactionController)));++ [TestMethod]+ public void AdminPaymentTransactionController_HasAutoValidateAntiforgeryToken() =>+ Assert.IsTrue(typeof(PaymentTransactionController)+ .GetCustomAttributes(typeof(Microsoft.AspNetCore.Mvc.AutoValidateAntiforgeryTokenAttribute), false)+ .Length > 0);+}diff --git a/src/Tests/Grand.Web.Store.Tests/Controllers/PaymentTransactionControllerRoutingTests.cs b/src/Tests/Grand.Web.Store.Tests/Controllers/PaymentTransactionControllerRoutingTests.csnew file mode 100644index 000000000..9f5574689--- /dev/null+++ b/src/Tests/Grand.Web.Store.Tests/Controllers/PaymentTransactionControllerRoutingTests.cs@@ -0,0 +1,35 @@+using Grand.Web.AdminShared.Controllers;+using Grand.Web.Common.Filters;+using Grand.Web.Store.Controllers;+using Grand.Web.Store.Extensions;+using Microsoft.AspNetCore.Mvc;+using Microsoft.VisualStudio.TestTools.UnitTesting;++namespace Grand.Web.Store.Tests.Controllers;++[TestClass]+public class PaymentTransactionControllerRoutingTests+{+ [TestMethod]+ public void StorePaymentTransactionController_InheritsBasePaymentTransactionController() =>+ Assert.IsTrue(typeof(BasePaymentTransactionController).IsAssignableFrom(typeof(PaymentTransactionController)));++ [TestMethod]+ public void StorePaymentTransactionController_HasAutoValidateAntiforgeryToken() =>+ Assert.IsTrue(typeof(PaymentTransactionController)+ .GetCustomAttributes(typeof(Microsoft.AspNetCore.Mvc.AutoValidateAntiforgeryTokenAttribute), false)+ .Length > 0);++ [TestMethod]+ public void StorePaymentTransactionController_HasAreaAttributeWithStoreArea()+ {+ var areaAttr = (AreaAttribute)Attribute.GetCustomAttribute(typeof(PaymentTransactionController), typeof(AreaAttribute), false);+ Assert.IsNotNull(areaAttr, "Missing [Area].");+ Assert.AreEqual(Constants.AreaStore, areaAttr.RouteValue);+ }++ [TestMethod]+ public void StorePaymentTransactionController_HasAuthorizeStoreAttribute() =>+ Assert.IsTrue(typeof(PaymentTransactionController).IsDefined(typeof(AuthorizeStoreAttribute), false),+ "Missing [AuthorizeStore].");+}diff --git a/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs b/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.csindex e41a6a57d..a00543414 100644--- a/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs@@ -1,472 +1,35 @@-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.SharedKernel;-using Grand.Web.AdminShared.Models.Orders;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Localization;-using Grand.Web.Common.Security.Authorization;using Grand.Mediator;+using Grand.Web.Admin.Extensions;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc;-using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Admin.Controllers;-[PermissionAuthorize(PermissionSystemName.PaymentTransactions)]-public class PaymentTransactionController : BaseAdminController-{- #region Constructors-- public PaymentTransactionController(- ITranslationService translationService,- IPaymentTransactionService paymentTransactionService,- IOrderService orderService,- IDateTimeService dateTimeService,- IMediator mediator,- IEnumTranslationService enumTranslationService)- {- _translationService = translationService;- _paymentTransactionService = paymentTransactionService;- _orderService = orderService;- _dateTimeService = dateTimeService;- _mediator = mediator;- _enumTranslationService = enumTranslationService;- }-- #endregion-- #region Fields-- private readonly IPaymentTransactionService _paymentTransactionService;- private readonly IOrderService _orderService;- private readonly ITranslationService _translationService;- private readonly IDateTimeService _dateTimeService;- private readonly IMediator _mediator;- private readonly IEnumTranslationService _enumTranslationService;-- #endregion Fields-- #region Methods-- //list- public IActionResult Index()- {- return RedirectToAction("List");- }-- public IActionResult List()- {- var model = new PaymentTransactionListModel {- PaymentTransactionStatus = _enumTranslationService.ToSelectList(TransactionStatus.Pending, false)- .ToList()- };- model.PaymentTransactionStatus.Insert(0,- new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "-1", Selected = true });- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.List)]- [HttpPost]- public async Task<IActionResult> List(DataSourceRequest command, PaymentTransactionListModel model)- {- DateTime? startDateValue = model.StartDate == null- ? null- : _dateTimeService.ConvertToUtcTime(model.StartDate.Value, _dateTimeService.CurrentTimeZone);-- DateTime? endDateValue = model.EndDate == null- ? null- : _dateTimeService.ConvertToUtcTime(model.EndDate.Value, _dateTimeService.CurrentTimeZone);-- Guid? orderGuid = null;- if (!string.IsNullOrEmpty(model.OrderNumber))- if (int.TryParse(model.OrderNumber, out var ordernumber))- {- var order = await _orderService.GetOrderByNumber(ordernumber);- if (order != null)- orderGuid = order.OrderGuid;- }-- var paymentTransactions = await _paymentTransactionService.SearchPaymentTransactions(- customerEmail: model.SearchCustomerEmail,- ts: model.SearchTransactionStatus >= 0 ? (TransactionStatus)model.SearchTransactionStatus : null,- createdFromUtc: startDateValue,- createdToUtc: endDateValue,- storeId: model.StoreId,- orderGuid: orderGuid,- pageIndex: command.Page - 1,- pageSize: command.PageSize);-- var dataModel = new List<PaymentTransactionModel>();-- foreach (var item in paymentTransactions)- {- var order = await _orderService.GetOrderByGuid(item.OrderGuid);- var trmodel = new PaymentTransactionModel {- Id = item.Id,- OrderCode = item.OrderCode,- CustomerEmail = item.CustomerEmail,- CustomerId = item.CustomerId,- CurrencyCode = item.CurrencyCode,- TransactionAmount = item.TransactionAmount,- PaidAmount = item.PaidAmount,- PaymentMethodSystemName = item.PaymentMethodSystemName,- RefundedAmount = item.RefundedAmount,- OrderId = order?.Id,- OrderNumber = order?.OrderNumber,- CreatedOn = _dateTimeService.ConvertToUserTime(item.CreatedOnUtc, DateTimeKind.Utc),- TransactionStatus = item.TransactionStatus,- Status = _enumTranslationService.GetTranslationEnum(item.TransactionStatus)- };- dataModel.Add(trmodel);- }-- var gridModel = new DataSourceResult {- Data = dataModel.ToList(),- Total = paymentTransactions.TotalCount- };-- return Json(gridModel);- }-- [PermissionAuthorizeAction(PermissionActionName.Preview)]- [HttpPost]- public async Task<IActionResult> GoToOrderNumber(PaymentTransactionListModel model)- {- if (model.OrderNumber == null)- return RedirectToAction("List", "PaymentTransaction");-- int.TryParse(model.OrderNumber, out var id);-- var order = await _orderService.GetOrderByNumber(id);- if (order == null)- return RedirectToAction("List", "PaymentTransaction");-- var paymentTransaction = await _paymentTransactionService.GetOrderByGuid(order.OrderGuid);- if (paymentTransaction == null)- //not found- return RedirectToAction("List", "PaymentTransaction");-- return RedirectToAction("Edit", "PaymentTransaction", new { id = paymentTransaction.Id });- }--- //edit- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- 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,- //payment method buttons- //model.CanCancelOrder = await _mediator.Send(new CanCancelOrderQuery() { Order = order });- 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 = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- 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- Error(exc, false);- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> MarkPaymentTransactionAsPaid(string id)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- try- {- await _mediator.Send(new MarkAsPaidCommand { PaymentTransaction = paymentTransaction });- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- catch (Exception exc)- {- //error- Error(exc, false);- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> RefundPaymentTransaction(string id)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- 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- Error(exc, false);- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> RefundPaymentTransactionOffline(string id)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- try- {- await _mediator.Send(new RefundOfflineCommand { PaymentTransaction = paymentTransaction });- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- catch (Exception exc)- {- //error- Error(exc, false);- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> VoidPaymentTransaction(string id)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- 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- Error(exc, false);- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> VoidPaymentTransactionOffline(string id)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- try- {- await _mediator.Send(new VoidOfflineCommand { PaymentTransaction = paymentTransaction });- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- catch (Exception exc)- {- //error- Error(exc, false);- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> PartiallyRefundPopup(string id, bool online)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- var model = new PaymentTransactionModel {- Id = paymentTransaction.Id,- MaxAmountToRefund = paymentTransaction.TransactionAmount - paymentTransaction.RefundedAmount,- CurrencyCode = paymentTransaction.CurrencyCode- };-- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> PartiallyRefundPopup(string id, bool online, PaymentTransactionModel model)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- try- {- var amountToRefund = model.AmountToRefund;- if (amountToRefund <= 0)- throw new GrandException("Enter amount to refund");-- var maxAmountToRefund = paymentTransaction.TransactionAmount - paymentTransaction.RefundedAmount;- if (amountToRefund > maxAmountToRefund)- amountToRefund = maxAmountToRefund;-- var errors = new List<string>();- if (online)- errors = (await _mediator.Send(new PartiallyRefundCommand { PaymentTransaction = paymentTransaction, AmountToRefund = amountToRefund })).ToList();- else- await _mediator.Send(new PartiallyRefundOfflineCommand { PaymentTransaction = paymentTransaction, AmountToRefund = amountToRefund });-- if (errors.Count == 0)- {- //success- ViewBag.RefreshPage = true;- return View(model);- }-- //error- foreach (var error in errors)- Error(error);-- return View(model);- }- catch (Exception exc)- {- Error(exc, false);- return View(model);- }- }--- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> PartiallyPaidPopup(string id, bool online)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- var model = new PaymentTransactionModel {- Id = paymentTransaction.Id,- MaxAmountToPaid = paymentTransaction.TransactionAmount - paymentTransaction.PaidAmount,- CurrencyCode = paymentTransaction.CurrencyCode- };-- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> PartiallyPaidPopup(string id, bool online, PaymentTransactionModel model)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- try- {- var amountToPaid = model.AmountToPaid;- if (amountToPaid <= 0)- throw new GrandException("Enter amount to refund");-- var maxAmountToPaid = paymentTransaction.TransactionAmount - paymentTransaction.PaidAmount;- if (amountToPaid > maxAmountToPaid)- amountToPaid = maxAmountToPaid;-- await _mediator.Send(new PartiallyPaidOfflineCommand { PaymentTransaction = paymentTransaction, AmountToPaid = amountToPaid });-- ViewBag.RefreshPage = true;- return View(model);- }- catch (Exception exc)- {- Error(exc, false);- return View(model);- }- }-- //delete- [PermissionAuthorizeAction(PermissionActionName.Delete)]- [HttpPost]- public async Task<IActionResult> Delete(string id)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _paymentTransactionService.DeletePaymentTransaction(paymentTransaction);- Success(_translationService.GetResource("Admin.Orders.PaymentTransaction.Deleted"));- return RedirectToAction("List", "PaymentTransaction");- }-- Error(ModelState);- return RedirectToAction("Edit", new { id = paymentTransaction.Id });- }-- #endregion-}\ No newline at end of file+// Reduced to a thin subclass of BasePaymentTransactionController (ARCH-001 PaymentTransaction+// consolidation). All regions of behavior live in the shared base; this class only supplies+// Admin's DI wiring plus the attributes that used to arrive transitively via BaseAdminController -+// BasePaymentTransactionController can't inherit any single host's base controller (it's shared+// across Admin/Store, each with a different [Area]/[Authorize*] pair), so each subclass restates+// its own host's attribute set explicitly. Same pattern as CollectionController/CategoryController.+[AuthorizeAdmin]+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaAdmin)]+[AuthorizeMenu]+public class PaymentTransactionController(+ IPaymentTransactionService paymentTransactionService,+ IOrderService orderService,+ ITranslationService translationService,+ IDateTimeService dateTimeService,+ IMediator mediator,+ IEnumTranslationService enumTranslationService,+ IAdminDataScope<PaymentTransaction> scope)+ : BasePaymentTransactionController(paymentTransactionService, orderService, translationService,+ dateTimeService, mediator, enumTranslationService, scope);diff --git a/src/Web/Grand.Web.Store/Controllers/PaymentTransactionController.cs b/src/Web/Grand.Web.Store/Controllers/PaymentTransactionController.csindex 32f071ead..5298185e2 100644--- a/src/Web/Grand.Web.Store/Controllers/PaymentTransactionController.cs+++ b/src/Web/Grand.Web.Store/Controllers/PaymentTransactionController.cs@@ -1,525 +1,33 @@-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.Permissions;using Grand.Domain.Payments;-using Grand.Infrastructure;-using Grand.SharedKernel;-using Grand.Web.AdminShared.Models.Orders;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Localization;-using Grand.Web.Common.Security.Authorization;using Grand.Mediator;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Localization;+using Grand.Web.Store.Extensions;using Microsoft.AspNetCore.Mvc;-using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Store.Controllers;-[PermissionAuthorize(PermissionSystemName.PaymentTransactions)]-public class PaymentTransactionController : BaseStoreController-{- #region Constructors-- public PaymentTransactionController(- ITranslationService translationService,- IPaymentTransactionService paymentTransactionService,- IOrderService orderService,- IContextAccessor contextAccessor,- IDateTimeService dateTimeService,- IMediator mediator,- IEnumTranslationService enumTranslationService)- {- _translationService = translationService;- _paymentTransactionService = paymentTransactionService;- _orderService = orderService;- _contextAccessor = contextAccessor;- _dateTimeService = dateTimeService;- _mediator = mediator;- _enumTranslationService = enumTranslationService;- }-- #endregion-- #region Fields-- private readonly IPaymentTransactionService _paymentTransactionService;- private readonly IOrderService _orderService;- private readonly ITranslationService _translationService;- private readonly IContextAccessor _contextAccessor;- private readonly IDateTimeService _dateTimeService;- private readonly IMediator _mediator;- private readonly IEnumTranslationService _enumTranslationService;-- #endregion Fields-- #region Methods-- //list- public IActionResult Index()- {- return RedirectToAction("List");- }-- public IActionResult List()- {- var model = new PaymentTransactionListModel {- PaymentTransactionStatus = _enumTranslationService.ToSelectList(TransactionStatus.Pending, false)- .ToList()- };- model.PaymentTransactionStatus.Insert(0,- new SelectListItem- { Text = _translationService.GetResource("Admin.Common.All"), Value = "-1", Selected = true });- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.List)]- [HttpPost]- public async Task<IActionResult> List(DataSourceRequest command, PaymentTransactionListModel model)- {- model.StoreId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;- DateTime? startDateValue = model.StartDate == null- ? null- : _dateTimeService.ConvertToUtcTime(model.StartDate.Value, _dateTimeService.CurrentTimeZone);-- DateTime? endDateValue = model.EndDate == null- ? null- : _dateTimeService.ConvertToUtcTime(model.EndDate.Value, _dateTimeService.CurrentTimeZone);-- Guid? orderGuid = null;- if (!string.IsNullOrEmpty(model.OrderNumber))- if (int.TryParse(model.OrderNumber, out var ordernumber))- {- var order = await _orderService.GetOrderByNumber(ordernumber);- if (order != null)- orderGuid = order.OrderGuid;- }-- var paymentTransactions = await _paymentTransactionService.SearchPaymentTransactions(- customerEmail: model.SearchCustomerEmail,- ts: model.SearchTransactionStatus >= 0 ? (TransactionStatus)model.SearchTransactionStatus : null,- createdFromUtc: startDateValue,- createdToUtc: endDateValue,- storeId: model.StoreId,- orderGuid: orderGuid,- pageIndex: command.Page - 1,- pageSize: command.PageSize);-- var dataModel = new List<PaymentTransactionModel>();-- foreach (var item in paymentTransactions)- {- var order = await _orderService.GetOrderByGuid(item.OrderGuid);- var trmodel = new PaymentTransactionModel {- Id = item.Id,- OrderCode = item.OrderCode,- CustomerEmail = item.CustomerEmail,- CustomerId = item.CustomerId,- CurrencyCode = item.CurrencyCode,- TransactionAmount = item.TransactionAmount,- PaidAmount = item.PaidAmount,- PaymentMethodSystemName = item.PaymentMethodSystemName,- RefundedAmount = item.RefundedAmount,- OrderId = order?.Id,- OrderNumber = order?.OrderNumber,- CreatedOn = _dateTimeService.ConvertToUserTime(item.CreatedOnUtc, DateTimeKind.Utc),- TransactionStatus = item.TransactionStatus,- Status = _enumTranslationService.GetTranslationEnum(item.TransactionStatus)- };- dataModel.Add(trmodel);- }-- var gridModel = new DataSourceResult {- Data = dataModel.ToList(),- Total = paymentTransactions.TotalCount- };-- return Json(gridModel);- }-- [PermissionAuthorizeAction(PermissionActionName.Preview)]- [HttpPost]- public async Task<IActionResult> GoToOrderNumber(PaymentTransactionListModel model)- {- if (model.OrderNumber == null)- return RedirectToAction("List", "PaymentTransaction");-- int.TryParse(model.OrderNumber, out var id);-- var order = await _orderService.GetOrderByNumber(id);- if (order == null)- return RedirectToAction("List", "PaymentTransaction");-- var paymentTransaction = await _paymentTransactionService.GetOrderByGuid(order.OrderGuid);- if (paymentTransaction == null)- //not found- return RedirectToAction("List", "PaymentTransaction");-- if (paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)- return RedirectToAction("List", "PaymentTransaction");-- return RedirectToAction("Edit", "PaymentTransaction", new { id = paymentTransaction.Id });- }--- //edit- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- if (paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)- return RedirectToAction("List", "PaymentTransaction");-- 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,- //payment method buttons- //model.CanCancelOrder = await _mediator.Send(new CanCancelOrderQuery() { Order = order });- 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 = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- if (paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)- return RedirectToAction("List", "PaymentTransaction");-- 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- Error(exc, false);- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> MarkPaymentTransactionAsPaid(string id)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- if (paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)- return RedirectToAction("List", "PaymentTransaction");-- try- {- await _mediator.Send(new MarkAsPaidCommand { PaymentTransaction = paymentTransaction });- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- catch (Exception exc)- {- //error- Error(exc, false);- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> RefundPaymentTransaction(string id)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- if (paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)- return RedirectToAction("List", "PaymentTransaction");-- 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- Error(exc, false);- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> RefundPaymentTransactionOffline(string id)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- if (paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)- return RedirectToAction("List", "PaymentTransaction");-- try- {- await _mediator.Send(new RefundOfflineCommand { PaymentTransaction = paymentTransaction });- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- catch (Exception exc)- {- //error- Error(exc, false);- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> VoidPaymentTransaction(string id)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- if (paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)- return RedirectToAction("List", "PaymentTransaction");-- 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- Error(exc, false);- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> VoidPaymentTransactionOffline(string id)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- if (paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)- return RedirectToAction("List", "PaymentTransaction");-- try- {- await _mediator.Send(new VoidOfflineCommand { PaymentTransaction = paymentTransaction });- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- catch (Exception exc)- {- //error- Error(exc, false);- return RedirectToAction("Edit", "PaymentTransaction", new { id });- }- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> PartiallyRefundPopup(string id, bool online)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- if (paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)- return RedirectToAction("List", "PaymentTransaction");-- var model = new PaymentTransactionModel {- Id = paymentTransaction.Id,- MaxAmountToRefund = paymentTransaction.TransactionAmount - paymentTransaction.RefundedAmount,- CurrencyCode = paymentTransaction.CurrencyCode- };-- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> PartiallyRefundPopup(string id, bool online, PaymentTransactionModel model)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- if (paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)- return RedirectToAction("List", "PaymentTransaction");-- try- {- var amountToRefund = model.AmountToRefund;- if (amountToRefund <= 0)- throw new GrandException("Enter amount to refund");-- var maxAmountToRefund = paymentTransaction.TransactionAmount - paymentTransaction.RefundedAmount;- if (amountToRefund > maxAmountToRefund)- amountToRefund = maxAmountToRefund;-- var errors = new List<string>();- if (online)- errors = (await _mediator.Send(new PartiallyRefundCommand- { PaymentTransaction = paymentTransaction, AmountToRefund = amountToRefund })).ToList();- else- await _mediator.Send(new PartiallyRefundOfflineCommand- { PaymentTransaction = paymentTransaction, AmountToRefund = amountToRefund });-- if (errors.Count == 0)- {- //success- model.RefreshPage = true;- return View(model);- }-- //error- foreach (var error in errors)- Error(error);-- return View(model);- }- catch (Exception exc)- {- Error(exc, false);- return View(model);- }- }--- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> PartiallyPaidPopup(string id, bool online)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- if (paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)- return RedirectToAction("List", "PaymentTransaction");-- var model = new PaymentTransactionModel {- Id = paymentTransaction.Id,- MaxAmountToPaid = paymentTransaction.TransactionAmount - paymentTransaction.PaidAmount,- CurrencyCode = paymentTransaction.CurrencyCode- };-- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> PartiallyPaidPopup(string id, bool online, PaymentTransactionModel model)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List", "PaymentTransaction");-- if (paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)- return RedirectToAction("List", "PaymentTransaction");-- try- {- var amountToPaid = model.AmountToPaid;- if (amountToPaid <= 0)- throw new GrandException("Enter amount to refund");-- var maxAmountToPaid = paymentTransaction.TransactionAmount - paymentTransaction.PaidAmount;- if (amountToPaid > maxAmountToPaid)- amountToPaid = maxAmountToPaid;-- await _mediator.Send(new PartiallyPaidOfflineCommand- { PaymentTransaction = paymentTransaction, AmountToPaid = amountToPaid });-- model.RefreshPage = true;- return View(model);- }- catch (Exception exc)- {- Error(exc, false);- return View(model);- }- }-- //delete- [PermissionAuthorizeAction(PermissionActionName.Delete)]- [HttpPost]- public async Task<IActionResult> Delete(string id)- {- var paymentTransaction = await _paymentTransactionService.GetById(id);- if (paymentTransaction == null)- return RedirectToAction("List");-- if (paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)- return RedirectToAction("List", "MerchandiseReturn");-- if (ModelState.IsValid)- {- await _paymentTransactionService.DeletePaymentTransaction(paymentTransaction);- Success(_translationService.GetResource("Admin.Orders.PaymentTransaction.Deleted"));- return RedirectToAction("List", "PaymentTransaction");- }-- Error(ModelState);- return RedirectToAction("Edit", new { id = paymentTransaction.Id });- }-- #endregion-}\ No newline at end of file+// Reduced to a thin subclass of BasePaymentTransactionController (ARCH-001 PaymentTransaction+// consolidation). All regions of behavior live in the shared base; this class only supplies+// Store's DI wiring and the attributes that used to arrive transitively via BaseStoreController.+// Same pattern as CollectionController/CategoryController (see those files).+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaStore)]+[AuthorizeStore]+[AuthorizeMenu]+public class PaymentTransactionController(+ IPaymentTransactionService paymentTransactionService,+ IOrderService orderService,+ ITranslationService translationService,+ IDateTimeService dateTimeService,+ IMediator mediator,+ IEnumTranslationService enumTranslationService,+ IAdminDataScope<PaymentTransaction> scope)+ : BasePaymentTransactionController(paymentTransactionService, orderService, translationService,+ dateTimeService, mediator, enumTranslationService, scope);