VCST-4983: Improve refund flow

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

@@ -92,16 +92,25 @@ public virtual async Task ProcessRefundChangesAsync(RefundChangedJobArgument[] j
                     { "IsUpdate", "true" },
                 };
 
+                var previousStatus = refund.Status;
                 try
                 {
                     var result = await payment.PaymentMethod.RefundProcessPaymentAsync(refundRequest);
                     if (result.IsSuccess)
                     {
                         refund.Status = result.NewRefundStatus.ToString();
+                        if (!string.IsNullOrEmpty(result.OuterId))
+                        {
+                            refund.OuterId = result.OuterId;
+                        }
+                        refund.RejectReasonMessage = null;
                     }
                     else
                     {
-                        refund.Status = nameof(RefundStatus.Rejected);
+                        // A failed modification must not invalidate the underlying refund state.
+                        // NewRefundStatus is non-nullable and defaults to Pending, so we cannot distinguish
+                        // "provider didn't set it" from "provider explicitly reports Pending" -- preserve prior state.
+                        refund.Status = previousStatus;
                         refund.RejectReasonMessage = result.ErrorMessage;
                     }
 
@@ -166,10 +175,14 @@ protected virtual RefundChangedJobArgument[] GetJobArgumentsForChangedEntry(Gene
 
         protected virtual bool HasRefundFieldChanges(Refund oldRefund, Refund newRefund)
         {
+            // Status and OuterId are intentionally NOT tracked here: both are written by the provider response
+            // (via PaymentFlowService.SaveResultToRefundDocument or this handler), so tracking them would
+            // re-trigger the handler from its own SaveChangesAsync and cause duplicate provider calls.
+            // Manual status edits on submitted refunds are blocked at the UI.
             return oldRefund.Amount != newRefund.Amount
                 || oldRefund.ReasonCode != newRefund.ReasonCode
                 || oldRefund.ReasonMessage != newRefund.ReasonMessage
-                || oldRefund.OuterId != newRefund.OuterId;
+                || oldRefund.IsCancelled != newRefund.IsCancelled;
         }
     }
 

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

@@ -242,6 +242,10 @@ protected virtual async Task<RefundOrderPaymentResult> SaveResultToRefundDocumen
             if (refundResult.IsSuccess)
             {
                 refund.Status = refundResult.NewRefundStatus.ToString();
+                if (!string.IsNullOrEmpty(refundResult.OuterId))
+                {
+                    refund.OuterId = refundResult.OuterId;
+                }
                 result.RefundStatus = refund.Status;
                 result.Succeeded = true;
             }
@@ -343,6 +347,10 @@ public virtual async Task<CaptureOrderPaymentResult> SaveResultToCaptureDocument
             if (captureResult.IsSuccess)
             {
                 capture.Status = nameof(CaptureStatus.Processed);
+                if (!string.IsNullOrEmpty(captureResult.OuterId))
+                {
+                    capture.OuterId = captureResult.OuterId;
+                }
                 paymentInfo.Payment.Status = captureResult.NewPaymentStatus.ToString();
                 result.PaymentStatus = paymentInfo.Payment.Status;
                 result.Succeeded = true;

src/VirtoCommerce.OrdersModule.Web/Scripts/blades/operation-detail.js

@@ -271,6 +271,11 @@ angular.module('virtoCommerce.orderModule')
                                 || blade.currentEntity.cancelledState === 'Completed'
                                 || blade.currentEntity.cancelledState === 'Requested');
                             break;
+                        case 'Refund':
+                            result = !blade.currentEntity.isCancelled
+                                && blade.currentEntity.status !== 'Processed'
+                                && !blade.currentEntity.outerId;
+                            break;
                         default:
                             result = !blade.currentEntity.isCancelled;
                             break;

src/VirtoCommerce.OrdersModule.Web/Scripts/blades/refund-detail.html

@@ -19,7 +19,7 @@
                                                          placeholder="'orders.blades.refund-details.placeholders.status' | translate"
                                                          setting="'Refund.Status'"
                                                          ng-model="blade.currentEntity.status"
-                                                         disabled="blade.isLocked"></va-setting-value-select>
+                                                         disabled="blade.isLocked || blade.currentEntity.outerId || blade.currentEntity.status === 'Processed'"></va-setting-value-select>
                             </div>
                             <div class="form-group">
                                 <label class="form-label">{{ 'orders.blades.refund-details.labels.amount' | translate }}</label>

tests/VirtoCommerce.OrdersModule.Tests/VirtoCommerce.OrdersModule.Tests.csproj

@@ -5,7 +5,7 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="8.0.1">
+    <PackageReference Include="coverlet.collector" Version="10.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>