From ccbb280920247ca135d71fc1f4404d179d528ee2 Mon Sep 17 00:00:00 2001
From: vc-ci <ci@virtocommerce.com>
Date: Thu, 26 Oct 2023 07:29:35 +0000
Subject: [PATCH 1/2] 3.418.0

---
 Directory.Build.props                              | 2 +-
 src/VirtoCommerce.OrdersModule.Web/module.manifest | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 9ab39a76..bbcacaba 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.417.0</VersionPrefix>
+    <VersionPrefix>3.418.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>
diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest
index aafc1137..bf4bd5f2 100644
--- a/src/VirtoCommerce.OrdersModule.Web/module.manifest
+++ b/src/VirtoCommerce.OrdersModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Orders</id>
-  <version>3.417.0</version>
+  <version>3.418.0</version>
   <version-tag />
   <platformVersion>3.413.0</platformVersion>
   <dependencies>

From dacfe2a33ed3512afcf5db0a5d421e370dfce718 Mon Sep 17 00:00:00 2001
From: Oleg Zhuk <zhukoo@gmail.com>
Date: Thu, 2 Nov 2023 09:20:40 +0200
Subject: [PATCH 2/2] PT-14280: Pending Capture and Refund should be repeatable
 (#385)

fix: Capture and Refund should be repeatable with same transaction id if Status is Pending
---
 .../Services/PaymentFlowService.cs                            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/VirtoCommerce.OrdersModule.Data/Services/PaymentFlowService.cs b/src/VirtoCommerce.OrdersModule.Data/Services/PaymentFlowService.cs
index caea3a90..6d0b2baf 100644
--- a/src/VirtoCommerce.OrdersModule.Data/Services/PaymentFlowService.cs
+++ b/src/VirtoCommerce.OrdersModule.Data/Services/PaymentFlowService.cs
@@ -97,7 +97,7 @@ protected virtual async Task<RefundOrderPaymentResult> CreateRefundDocument(Refu
 
             // Allows to Update and Retry Rejected Refund document.
             var refund = paymentInfo.Payment.Refunds.FirstOrDefault(r => r.TransactionId == request.TransactionId
-                && r.Status == RefundStatus.Rejected.ToString());
+                && r.Status != RefundStatus.Processed.ToString());
 
             if (refund != null)
             {
@@ -174,7 +174,7 @@ public virtual async Task<CaptureOrderPaymentResult> CreateCaptureDocument(Captu
 
             // Allows to Update and Retry Rejected Capture document.
             var capture = paymentInfo.Payment.Captures.FirstOrDefault(c => c.TransactionId == request.TransactionId
-                && c.Status == CaptureStatus.Rejected.ToString());
+                && c.Status != CaptureStatus.Processed.ToString());
 
             if (capture != null)
             {