CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-08-06 10:07:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

add acceptor_id to the giftcard transaction webhook event

Browse Source
This commit is contained in:
Lukas Bockstaller
2026-01-22 13:39:26 +01:00
parent ad78934ad2
commit aee76b094d
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/api/views/organizer.py
+4 -3
View File
@@ -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)
src/pretix/api/webhooks.py
+3 -2
View File
@@ -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,
}
src/pretix/base/payment.py
+3 -1
View File
@@ -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,
}
)
src/pretix/control/views/organizer.py
+4 -2
View File
@@ -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(