From b0f82d9041f419af26db2472afdc23190641c9ba Mon Sep 17 00:00:00 2001
From: Raphael Michel <michel@rami.io>
Date: Tue, 12 Aug 2025 16:43:05 +0200
Subject: [PATCH] Fix failing tests

---
 src/pretix/base/services/orders.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/pretix/base/services/orders.py b/src/pretix/base/services/orders.py
index f490cfc6b3..953ff6b67b 100644
--- a/src/pretix/base/services/orders.py
+++ b/src/pretix/base/services/orders.py
@@ -2656,7 +2656,7 @@ class OrderChangeManager:
             fee._calculate_tax()
             if payment_fee != 0:
                 fee.save()
-                fees.append(new_fee)
+                fees.append(fee)
             elif fee.pk:
                 if fee in fees:
                     fees.remove(fee)
@@ -3200,14 +3200,16 @@ def change_payment_provider(order: Order, payment_provider, amount=None, new_pay
         fee.value = new_fee
         fee.internal_type = payment_provider.identifier
         fee._calculate_tax()
-        if not fee.pk:
-            fees.append(fee)
-        fee.save()
-    else:
-        if fee.pk:
-            fee.delete()
         if fee in fees:
             fees.remove(fee)
+        # "Update instance in the fees array
+        fees.append(fee)
+        fee.save()
+    else:
+        if fee in fees:
+            fees.remove(fee)
+        if fee.pk:
+            fee.delete()
         fee = None
 
     rounding_changed |= set(apply_rounding(