From aee76b094dab3ecaf4b80b36580893e5adef3881 Mon Sep 17 00:00:00 2001
From: Lukas Bockstaller <bockstaller@pretix.eu>
Date: Thu, 22 Jan 2026 13:39:26 +0100
Subject: [PATCH] add acceptor_id to the giftcard transaction webhook event

---
 src/pretix/api/views/organizer.py     | 7 ++++---
 src/pretix/api/webhooks.py            | 5 +++--
 src/pretix/base/payment.py            | 4 +++-
 src/pretix/control/views/organizer.py | 6 ++++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/pretix/api/views/organizer.py b/src/pretix/api/views/organizer.py
index 18f6a89358..33f0f478fa 100644
--- a/src/pretix/api/views/organizer.py
+++ b/src/pretix/api/views/organizer.py
@@ -259,7 +259,7 @@ class GiftCardViewSet(viewsets.ModelViewSet):
             action='pretix.giftcards.transaction.manual',
             user=self.request.user,
             auth=self.request.auth,
-            data=merge_dicts(self.request.data, {'id': inst.pk})
+            data=merge_dicts(self.request.data, {'id': inst.pk, 'acceptor_id':self.request.organizer.id})
         )
 
     @transaction.atomic()
@@ -290,7 +290,7 @@ class GiftCardViewSet(viewsets.ModelViewSet):
                 action='pretix.giftcards.transaction.manual',
                 user=self.request.user,
                 auth=self.request.auth,
-                data={'value': diff}
+                data={'value': diff, 'acceptor_id':self.request.organizer.id}
             )
 
         return inst
@@ -319,7 +319,8 @@ class GiftCardViewSet(viewsets.ModelViewSet):
             auth=self.request.auth,
             data={
                 'value': value,
-                'text': text
+                'text': text,
+                'acceptor_id': self.request.organizer.id
             }
         )
         return Response(GiftCardSerializer(gc, context=self.get_serializer_context()).data, status=status.HTTP_200_OK)
diff --git a/src/pretix/api/webhooks.py b/src/pretix/api/webhooks.py
index 6603f50449..570448cd37 100644
--- a/src/pretix/api/webhooks.py
+++ b/src/pretix/api/webhooks.py
@@ -182,7 +182,7 @@ class ParametrizedGiftcardWebhookEvent(ParametrizedWebhookEvent):
 
         return {
             'notification_id': logentry.pk,
-            'issuer': logentry.organizer_id,
+            'issuer_id': logentry.organizer_id,
             'giftcard': giftcard.pk,
             'action': logentry.action_type,
         }
@@ -196,7 +196,8 @@ class ParametrizedGiftcardTransactionWebhookEvent(ParametrizedWebhookEvent):
 
         return {
             'notification_id': logentry.pk,
-            'acceptor': logentry.organizer_id,
+            'issuer_id': logentry.organizer_id,
+            'acceptor_id': logentry.parsed_data.get('acceptor_id'),
             'giftcard': giftcard.pk,
             'action': logentry.action_type,
         }
diff --git a/src/pretix/base/payment.py b/src/pretix/base/payment.py
index ee61e3c678..bfd1e30220 100644
--- a/src/pretix/base/payment.py
+++ b/src/pretix/base/payment.py
@@ -1649,7 +1649,8 @@ class GiftCardPayment(BasePaymentProvider):
                 gc.log_action(
                     action='pretix.giftcards.transaction.payment',
                     data={
-                        'value': trans.value
+                        'value': trans.value,
+                        'acceptor_id': self.event.organizer.id
                     }
                 )
         except PaymentException as e:
@@ -1680,6 +1681,7 @@ class GiftCardPayment(BasePaymentProvider):
             action='pretix.giftcards.transaction.refund',
             data={
                 'value': refund.amount,
+                'acceptor_id': self.event.organizer.id,
                 'text': refund.comment,
             }
         )
diff --git a/src/pretix/control/views/organizer.py b/src/pretix/control/views/organizer.py
index e12ec88946..b5b76e99e1 100644
--- a/src/pretix/control/views/organizer.py
+++ b/src/pretix/control/views/organizer.py
@@ -1851,7 +1851,8 @@ class GiftCardDetailView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMi
                         action='pretix.giftcards.transaction.manual',
                         data={
                             'value': value,
-                            'text': request.POST.get('text')
+                            'text': request.POST.get('text'),
+                            'acceptor_id': self.request.organizer.id
                         },
                         user=self.request.user,
                     )
@@ -1913,7 +1914,8 @@ class GiftCardCreateView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMi
                 action='pretix.giftcards.transaction.manual',
                 user=self.request.user,
                 data={
-                    'value': form.cleaned_data['value']
+                    'value': form.cleaned_data['value'],
+                    'acceptor_id': self.request.organizer.id
                 }
             )
         return redirect(reverse(