Payment transaction

Author: KrzysztofPajak

src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs

@@ -4,8 +4,8 @@
 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.Domain.Permissions;
 using Grand.Infrastructure;
 using Grand.SharedKernel;
 using Grand.Web.AdminShared.Models.Orders;
@@ -28,7 +28,6 @@ public PaymentTransactionController(
         IPaymentTransactionService paymentTransactionService,
         IOrderService orderService,
         IContextAccessor contextAccessor,
-        IGroupService groupService,
         IDateTimeService dateTimeService,
         IMediator mediator,
         IEnumTranslationService enumTranslationService)
@@ -37,7 +36,6 @@ public PaymentTransactionController(
         _paymentTransactionService = paymentTransactionService;
         _orderService = orderService;
         _contextAccessor = contextAccessor;
-        _groupService = groupService;
         _dateTimeService = dateTimeService;
         _mediator = mediator;
         _enumTranslationService = enumTranslationService;
@@ -51,11 +49,10 @@ public PaymentTransactionController(
     private readonly IOrderService _orderService;
     private readonly ITranslationService _translationService;
     private readonly IContextAccessor _contextAccessor;
-    private readonly IGroupService _groupService;
     private readonly IDateTimeService _dateTimeService;
     private readonly IMediator _mediator;
     private readonly IEnumTranslationService _enumTranslationService;
-    
+
     #endregion Fields
 
     #region Methods
@@ -73,17 +70,14 @@ public IActionResult List()
                 .ToList()
         };
         model.PaymentTransactionStatus.Insert(0,
-            new SelectListItem
-                { Text = _translationService.GetResource("Admin.Common.All"), Value = "-1", Selected = true });
+            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)
     {
-        if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
-            model.StoreId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;
         DateTime? startDateValue = model.StartDate == null
             ? null
             : _dateTimeService.ConvertToUtcTime(model.StartDate.Value, _dateTimeService.CurrentTimeZone);
@@ -161,10 +155,6 @@ public async Task<IActionResult> GoToOrderNumber(PaymentTransactionListModel mod
             //not found
             return RedirectToAction("List", "PaymentTransaction");
 
-        if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&
-            paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List", "PaymentTransaction");
-
         return RedirectToAction("Edit", "PaymentTransaction", new { id = paymentTransaction.Id });
     }
 
@@ -177,10 +167,6 @@ public async Task<IActionResult> Edit(string id)
         if (paymentTransaction == null)
             return RedirectToAction("List", "PaymentTransaction");
 
-        if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&
-            paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List", "PaymentTransaction");
-
         var order = await _orderService.GetOrderByGuid(paymentTransaction.OrderGuid);
 
         var model = new PaymentTransactionModel {
@@ -207,17 +193,12 @@ public async Task<IActionResult> Edit(string id)
             //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 }),
+            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 }),
+            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,
@@ -236,10 +217,6 @@ public async Task<IActionResult> CapturePaymentTransaction(string id)
         if (paymentTransaction == null)
             return RedirectToAction("List", "PaymentTransaction");
 
-        if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&
-            paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List", "PaymentTransaction");
-
         try
         {
             var errors = await _mediator.Send(new CaptureCommand { PaymentTransaction = paymentTransaction });
@@ -265,10 +242,6 @@ public async Task<IActionResult> MarkPaymentTransactionAsPaid(string id)
         if (paymentTransaction == null)
             return RedirectToAction("List", "PaymentTransaction");
 
-        if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&
-            paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List", "PaymentTransaction");
-
         try
         {
             await _mediator.Send(new MarkAsPaidCommand { PaymentTransaction = paymentTransaction });
@@ -290,10 +263,6 @@ public async Task<IActionResult> RefundPaymentTransaction(string id)
         if (paymentTransaction == null)
             return RedirectToAction("List", "PaymentTransaction");
 
-        if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&
-            paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List", "PaymentTransaction");
-
         try
         {
             var errors = await _mediator.Send(new RefundCommand { PaymentTransaction = paymentTransaction });
@@ -318,10 +287,6 @@ public async Task<IActionResult> RefundPaymentTransactionOffline(string id)
         if (paymentTransaction == null)
             return RedirectToAction("List", "PaymentTransaction");
 
-        if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&
-            paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List", "PaymentTransaction");
-
         try
         {
             await _mediator.Send(new RefundOfflineCommand { PaymentTransaction = paymentTransaction });
@@ -343,10 +308,6 @@ public async Task<IActionResult> VoidPaymentTransaction(string id)
         if (paymentTransaction == null)
             return RedirectToAction("List", "PaymentTransaction");
 
-        if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&
-            paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List", "PaymentTransaction");
-
         try
         {
             var errors = await _mediator.Send(new VoidCommand { PaymentTransaction = paymentTransaction });
@@ -371,10 +332,6 @@ public async Task<IActionResult> VoidPaymentTransactionOffline(string id)
         if (paymentTransaction == null)
             return RedirectToAction("List", "PaymentTransaction");
 
-        if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&
-            paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List", "PaymentTransaction");
-
         try
         {
             await _mediator.Send(new VoidOfflineCommand { PaymentTransaction = paymentTransaction });
@@ -395,10 +352,6 @@ public async Task<IActionResult> PartiallyRefundPopup(string id, bool online)
         if (paymentTransaction == null)
             return RedirectToAction("List", "PaymentTransaction");
 
-        if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&
-            paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List", "PaymentTransaction");
-
         var model = new PaymentTransactionModel {
             Id = paymentTransaction.Id,
             MaxAmountToRefund = paymentTransaction.TransactionAmount - paymentTransaction.RefundedAmount,
@@ -416,10 +369,6 @@ public async Task<IActionResult> PartiallyRefundPopup(string id, bool online, Pa
         if (paymentTransaction == null)
             return RedirectToAction("List", "PaymentTransaction");
 
-        if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&
-            paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List", "PaymentTransaction");
-
         try
         {
             var amountToRefund = model.AmountToRefund;
@@ -432,11 +381,9 @@ public async Task<IActionResult> PartiallyRefundPopup(string id, bool online, Pa
 
             var errors = new List<string>();
             if (online)
-                errors = (await _mediator.Send(new PartiallyRefundCommand
-                    { PaymentTransaction = paymentTransaction, AmountToRefund = amountToRefund })).ToList();
+                errors = (await _mediator.Send(new PartiallyRefundCommand { PaymentTransaction = paymentTransaction, AmountToRefund = amountToRefund })).ToList();
             else
-                await _mediator.Send(new PartiallyRefundOfflineCommand
-                    { PaymentTransaction = paymentTransaction, AmountToRefund = amountToRefund });
+                await _mediator.Send(new PartiallyRefundOfflineCommand { PaymentTransaction = paymentTransaction, AmountToRefund = amountToRefund });
 
             if (errors.Count == 0)
             {
@@ -466,10 +413,6 @@ public async Task<IActionResult> PartiallyPaidPopup(string id, bool online)
         if (paymentTransaction == null)
             return RedirectToAction("List", "PaymentTransaction");
 
-        if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&
-            paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List", "PaymentTransaction");
-
         var model = new PaymentTransactionModel {
             Id = paymentTransaction.Id,
             MaxAmountToPaid = paymentTransaction.TransactionAmount - paymentTransaction.PaidAmount,
@@ -487,10 +430,6 @@ public async Task<IActionResult> PartiallyPaidPopup(string id, bool online, Paym
         if (paymentTransaction == null)
             return RedirectToAction("List", "PaymentTransaction");
 
-        if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&
-            paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List", "PaymentTransaction");
-
         try
         {
             var amountToPaid = model.AmountToPaid;
@@ -501,8 +440,7 @@ public async Task<IActionResult> PartiallyPaidPopup(string id, bool online, Paym
             if (amountToPaid > maxAmountToPaid)
                 amountToPaid = maxAmountToPaid;
 
-            await _mediator.Send(new PartiallyPaidOfflineCommand
-                { PaymentTransaction = paymentTransaction, AmountToPaid = amountToPaid });
+            await _mediator.Send(new PartiallyPaidOfflineCommand { PaymentTransaction = paymentTransaction, AmountToPaid = amountToPaid });
 
             ViewBag.RefreshPage = true;
             return View(model);
@@ -523,9 +461,6 @@ public async Task<IActionResult> Delete(string id)
         if (paymentTransaction == null)
             return RedirectToAction("List");
 
-        if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&
-            paymentTransaction.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List", "MerchandiseReturn");
         if (ModelState.IsValid)
         {
             await _paymentTransactionService.DeletePaymentTransaction(paymentTransaction);