Merge branch 'release/3.867.0'

Author: vc-ci

Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.866.0</VersionPrefix>
+    <VersionPrefix>3.867.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.824.0" />
     <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.846.0" />
     <PackageReference Include="VirtoCommerce.NotificationsModule.Core" Version="3.830.0" />
-    <PackageReference Include="VirtoCommerce.PaymentModule.Core" Version="3.811.0" />
+    <PackageReference Include="VirtoCommerce.PaymentModule.Core" Version="3.813.0" />
     <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.917.0" />
     <PackageReference Include="VirtoCommerce.ShippingModule.Core" Version="3.816.0" />
     <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.823.0" />

src/VirtoCommerce.OrdersModule.Data/Handlers/CancelPaymentOrderChangedEventHandler.cs

@@ -46,7 +46,9 @@ public virtual async Task TryToCancelOrderPaymentsAsync(PaymentToCancelJobArgume
                     var paymentToCancel = order.InPayments.FirstOrDefault(x => x.Id.EqualsIgnoreCase(jobArgument.PaymentId));
                     if (paymentToCancel != null && !paymentToCancel.IsCancelled)
                     {
+#pragma warning disable VC0012
                         CancelPayment(paymentToCancel, order);
+#pragma warning restore VC0012
 
                         if (!changedOrders.Contains(order))
                         {
@@ -85,15 +87,27 @@ protected virtual PaymentToCancelJobArgument[] GetJobArgumentsForChangedEntry(Ge
             return toCancelPayments.Select(x => PaymentToCancelJobArgument.FromChangedEntry(changedEntry, x)).ToArray();
         }
 
+        [Obsolete("Use CancelPaymentAsync method instead", DiagnosticId = "VC0012", UrlFormat = "https://docs.virtocommerce.org/products/products-virto3-versions")]
         protected virtual void CancelPayment(PaymentIn paymentToCancel, CustomerOrder order)
+        {
+            CancelPaymentAsync(paymentToCancel, order).GetAwaiter().GetResult();
+        }
+
+        protected virtual async Task CancelPaymentAsync(PaymentIn paymentToCancel, CustomerOrder order)
         {
             if (paymentToCancel.PaymentStatus == PaymentStatus.Authorized)
             {
-                paymentToCancel.PaymentMethod?.VoidProcessPayment(new VoidPaymentRequest { PaymentId = paymentToCancel.Id, OrderId = order.Id, Payment = paymentToCancel, Order = order });
+                if (paymentToCancel.PaymentMethod != null)
+                {
+                    await paymentToCancel.PaymentMethod.VoidProcessPaymentAsync(new VoidPaymentRequest { PaymentId = paymentToCancel.Id, OrderId = order.Id, Payment = paymentToCancel, Order = order });
+                }
             }
             else if (paymentToCancel.PaymentStatus == PaymentStatus.Paid)
             {
-                paymentToCancel.PaymentMethod?.RefundProcessPayment(new RefundPaymentRequest { PaymentId = paymentToCancel.Id, OrderId = order.Id, Payment = paymentToCancel, Order = order });
+                if (paymentToCancel.PaymentMethod != null)
+                {
+                    await paymentToCancel.PaymentMethod.RefundProcessPaymentAsync(new RefundPaymentRequest { PaymentId = paymentToCancel.Id, OrderId = order.Id, Payment = paymentToCancel, Order = order });
+                }
             }
             else
             {

src/VirtoCommerce.OrdersModule.Data/Services/CustomerOrderPaymentService.cs

@@ -4,14 +4,12 @@
 using System.Threading.Tasks;
 using FluentValidation;
 using FluentValidation.Results;
-using VirtoCommerce.OrdersModule.Core;
 using VirtoCommerce.OrdersModule.Core.Model;
 using VirtoCommerce.OrdersModule.Core.Model.Search;
 using VirtoCommerce.OrdersModule.Core.Services;
 using VirtoCommerce.OrdersModule.Data.Model;
 using VirtoCommerce.PaymentModule.Model.Requests;
 using VirtoCommerce.Platform.Core.Common;
-using VirtoCommerce.Platform.Core.Settings;
 using VirtoCommerce.StoreModule.Core.Model;
 using VirtoCommerce.StoreModule.Core.Services;
 
@@ -45,7 +43,7 @@ public virtual async Task<PostProcessPaymentRequestResult> PostProcessPaymentAsy
         foreach (var inPayment in inPayments)
         {
             // Each payment method must check that these parameters are addressed to it
-            var paymentMethodValidationResult = inPayment.PaymentMethod.ValidatePostProcessRequest(paymentParameters.Parameters);
+            var paymentMethodValidationResult = await inPayment.PaymentMethod.ValidatePostProcessRequestAsync(paymentParameters.Parameters);
             if (!paymentMethodValidationResult.IsSuccess)
             {
                 continue;
@@ -63,7 +61,7 @@ public virtual async Task<PostProcessPaymentRequestResult> PostProcessPaymentAsy
                 Parameters = paymentParameters.Parameters,
             };
 
-            var paymentMethodPostProcessResult = inPayment.PaymentMethod.PostProcessPayment(paymentMethodRequest);
+            var paymentMethodPostProcessResult = await inPayment.PaymentMethod.PostProcessPaymentAsync(paymentMethodRequest);
             if (paymentMethodPostProcessResult == null)
             {
                 continue;

src/VirtoCommerce.OrdersModule.Data/Services/PaymentFlowService.cs

@@ -199,7 +199,7 @@ protected virtual async Task<RefundPaymentRequestResult> ProcessRefund(RefundOrd
             var paymentInfo = await GetPaymentInfoAsync(request, RefundAllowedPaymentStatuses);
             var refundRequest = GetRefundPaymentRequest(paymentInfo, request);
 
-            return paymentInfo.Payment.PaymentMethod.RefundProcessPayment(refundRequest);
+            return await paymentInfo.Payment.PaymentMethod.RefundProcessPaymentAsync(refundRequest);
         }
 
         protected virtual RefundPaymentRequest GetRefundPaymentRequest(OrderPaymentInfo paymentInfo, RefundOrderPaymentRequest request)
@@ -353,7 +353,7 @@ public virtual async Task<CapturePaymentRequestResult> ProcessCapture(CaptureOrd
             var paymentInfo = await GetPaymentInfoAsync(request, CaptureAllowedPaymentStatuses);
             var captureRequest = GetCapturePaymentRequest(paymentInfo, request);
 
-            return paymentInfo.Payment.PaymentMethod.CaptureProcessPayment(captureRequest);
+            return await paymentInfo.Payment.PaymentMethod.CaptureProcessPaymentAsync(captureRequest);
         }
 
         protected virtual async Task<CaptureOrderPaymentResult> CapturePaymentInternalAsync(CaptureOrderPaymentRequest request)

src/VirtoCommerce.OrdersModule.Web/Controllers/Api/OrderModuleController.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using DinkToPdf;
 using DinkToPdf.Contracts;
@@ -198,12 +199,13 @@ public async Task<ActionResult<CustomerOrder>> CalculateTotals([FromBody] Custom
         /// </summary>
         /// <param name="orderId">customer order id</param>
         /// <param name="paymentId">payment id</param>
+        /// <param name="cancellationToken">cancellationToken</param>
         [HttpPost]
         [Route("{orderId}/processPayment/{paymentId}")]
         [ApiExplorerSettings(IgnoreApi = true)]
-        public Task<ActionResult<ProcessPaymentRequestResult>> ProcessOrderPaymentsWithoutBankCardInfo([FromRoute] string orderId, [FromRoute] string paymentId)
+        public Task<ActionResult<ProcessPaymentRequestResult>> ProcessOrderPaymentsWithoutBankCardInfo([FromRoute] string orderId, [FromRoute] string paymentId, CancellationToken cancellationToken)
         {
-            return ProcessOrderPayments(orderId, paymentId, null);
+            return ProcessOrderPayments(orderId, paymentId, null, cancellationToken);
         }
 
         /// <summary>
@@ -213,10 +215,11 @@ public Task<ActionResult<ProcessPaymentRequestResult>> ProcessOrderPaymentsWitho
         /// <param name="orderId">customer order id</param>
         /// <param name="paymentId">payment id</param>
         /// <param name="bankCardInfo">banking card information</param>
+        /// <param name="cancellationToken">cancellationToken</param>
         [HttpPost]
         [Route("{orderId}/processPayment/{paymentId}")]
         [Consumes("application/json", "application/json-patch+json")] // It's a trick that allows ASP.NET infrastructure to select this action with body and ProcessOrderPaymentsWithoutBankCardInfo if no body
-        public async Task<ActionResult<ProcessPaymentRequestResult>> ProcessOrderPayments([FromRoute] string orderId, [FromRoute] string paymentId, [FromBody] BankCardInfo bankCardInfo)
+        public async Task<ActionResult<ProcessPaymentRequestResult>> ProcessOrderPayments([FromRoute] string orderId, [FromRoute] string paymentId, [FromBody] BankCardInfo bankCardInfo, CancellationToken cancellationToken)
         {
             var customerOrder = await customerOrderService.GetByIdAsync(orderId, CustomerOrderResponseGroup.Full.ToString());
 
@@ -267,7 +270,7 @@ public async Task<ActionResult<ProcessPaymentRequestResult>> ProcessOrderPayment
                 Store = store,
                 BankCardInfo = bankCardInfo
             };
-            var result = inPayment.PaymentMethod.ProcessPayment(request);
+            var result = await inPayment.PaymentMethod.ProcessPaymentAsync(request, cancellationToken);
             if (result.OuterId != null)
             {
                 inPayment.OuterId = result.OuterId;

src/VirtoCommerce.OrdersModule.Web/VirtoCommerce.OrdersModule.Web.csproj

@@ -24,7 +24,7 @@
   <ItemGroup>
     <PackageReference Include="DinkToPdfCopy" Version="1.0.0" />
     <PackageReference Include="VirtoCommerce.NotificationsModule.TemplateLoader.FileSystem" Version="3.830.0" />
-    <PackageReference Include="VirtoCommerce.PaymentModule.Data" Version="3.811.0" />
+    <PackageReference Include="VirtoCommerce.PaymentModule.Data" Version="3.813.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.OrdersModule.Core\VirtoCommerce.OrdersModule.Core.csproj" />

src/VirtoCommerce.OrdersModule.Web/module.manifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Orders</id>
-  <version>3.866.0</version>
+  <version>3.867.0</version>
   <version-tag />
 
   <platformVersion>3.917.0</platformVersion>
@@ -13,7 +13,7 @@
     <dependency id="VirtoCommerce.Customer" version="3.846.0" />
     <dependency id="VirtoCommerce.Inventory" version="3.815.0" />
     <dependency id="VirtoCommerce.Notifications" version="3.830.0" />
-    <dependency id="VirtoCommerce.Payment" version="3.811.0" />
+    <dependency id="VirtoCommerce.Payment" version="3.813.0" />
     <dependency id="VirtoCommerce.Search" version="3.821.0" />
     <dependency id="VirtoCommerce.Shipping" version="3.816.0" />
     <dependency id="VirtoCommerce.Store" version="3.823.0" />
@@ -30,7 +30,7 @@
   <projectUrl>https://github.com/VirtoCommerce/vc-module-order</projectUrl>
   <iconUrl>Modules/$(VirtoCommerce.Orders)/Content/logo.png</iconUrl>
   <requireLicenseAcceptance>false</requireLicenseAcceptance>
-  <copyright>Copyright © 2011-2025 Virto Commerce. All rights reserved</copyright>
+  <copyright>Copyright © 2011-2026 Virto Commerce. All rights reserved</copyright>
   <tags>order system</tags>
   <assemblyFile>VirtoCommerce.OrdersModule.Web.dll</assemblyFile>
   <moduleType>VirtoCommerce.OrdersModule.Web.Module, VirtoCommerce.OrdersModule.Web</moduleType>