CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-16 17:03:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

include acceptor slug in log/webhook event

Browse Source
This commit is contained in:
Lukas Bockstaller
2026-02-18 17:35:41 +01:00
parent fbd8bbbeaa
commit c25c03f398
5 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/pretix/api/views/organizer.py
View File

@@ -259,7 +259,14 @@ class GiftCardViewSet(viewsets.ModelViewSet):
action='pretix.giftcards.transaction.manual', action='pretix.giftcards.transaction.manual',
user=self.request.user, user=self.request.user,
auth=self.request.auth, auth=self.request.auth,
data=merge_dicts(self.request.data, {'id': inst.pk, 'acceptor_id': self.request.organizer.id}) data=merge_dicts(
self.request.data,
{
'id': inst.pk,
'acceptor_id': self.request.organizer.id,
'acceptor_slug': self.request.organizer.slug
}
)
) )
@transaction.atomic() @transaction.atomic()
@@ -290,7 +297,11 @@ class GiftCardViewSet(viewsets.ModelViewSet):
action='pretix.giftcards.transaction.manual', action='pretix.giftcards.transaction.manual',
user=self.request.user, user=self.request.user,
auth=self.request.auth, auth=self.request.auth,
data={'value': diff, 'acceptor_id': self.request.organizer.id} data={
'value': diff,
'acceptor_id': self.request.organizer.id,
'acceptor_slug': self.request.organizer.slug
}
) )
return inst return inst
@@ -320,7 +331,8 @@ class GiftCardViewSet(viewsets.ModelViewSet):
data={ data={
'value': value, 'value': value,
'text': text, 'text': text,
'acceptor_id': self.request.organizer.id 'acceptor_id': self.request.organizer.id,
'acceptor_slug': self.request.organizer.slug
} }
) )
return Response(GiftCardSerializer(gc, context=self.get_serializer_context()).data, status=status.HTTP_200_OK) return Response(GiftCardSerializer(gc, context=self.get_serializer_context()).data, status=status.HTTP_200_OK)

1
src/pretix/api/webhooks.py
View File

@@ -198,6 +198,7 @@ class ParametrizedGiftcardTransactionWebhookEvent(ParametrizedWebhookEvent):
'notification_id': logentry.pk, 'notification_id': logentry.pk,
'issuer_id': logentry.organizer_id, 'issuer_id': logentry.organizer_id,
'acceptor_id': logentry.parsed_data.get('acceptor_id'), 'acceptor_id': logentry.parsed_data.get('acceptor_id'),
'acceptor_slug': logentry.parsed_data.get('acceptor_slug'),
'giftcard': giftcard.pk, 'giftcard': giftcard.pk,
'action': logentry.action_type, 'action': logentry.action_type,
} }

4
src/pretix/base/payment.py
View File

@@ -1650,7 +1650,8 @@ class GiftCardPayment(BasePaymentProvider):
action='pretix.giftcards.transaction.payment', action='pretix.giftcards.transaction.payment',
data={ data={
'value': trans.value, 'value': trans.value,
'acceptor_id': self.event.organizer.id 'acceptor_id': self.event.organizer.id,
'acceptor_slug': self.event.organizer.slug
} }
) )
except PaymentException as e: except PaymentException as e:
@@ -1682,6 +1683,7 @@ class GiftCardPayment(BasePaymentProvider):
data={ data={
'value': refund.amount, 'value': refund.amount,
'acceptor_id': self.event.organizer.id, 'acceptor_id': self.event.organizer.id,
'acceptor_slug': self.event.organizer.slug,
'text': refund.comment, 'text': refund.comment,
} }
) )

11
src/pretix/base/services/orders.py
View File

@@ -253,7 +253,8 @@ def reactivate_order(order: Order, force: bool=False, user: User=None, auth=None
auth=auth, auth=auth,
data={ data={
'value': position.price, 'value': position.price,
'acceptor_id': order.event.organizer.id 'acceptor_id': order.event.organizer.id,
'acceptor_slug': order.event.organizer.slug
} }
) )
break break
@@ -563,6 +564,7 @@ def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device
data={ data={
'value': -position.price, 'value': -position.price,
'acceptor_id': order.event.organizer.id, 'acceptor_id': order.event.organizer.id,
'acceptor_slug': order.event.organizer.slug
} }
) )
@@ -2457,7 +2459,8 @@ class OrderChangeManager:
auth=self.auth, auth=self.auth,
data={ data={
'value': -position.price, 'value': -position.price,
'acceptor_id': self.order.event.organizer.id 'acceptor_id': self.order.event.organizer.id,
'acceptor_slug': self.order.event.organizer.slug
} }
) )
@@ -2483,7 +2486,8 @@ class OrderChangeManager:
auth=self.auth, auth=self.auth,
data={ data={
'value': -opa.position.price, 'value': -opa.position.price,
'acceptor_id': self.order.event.organizer.id 'acceptor_id': self.order.event.organizer.id,
'acceptor_slug': self.order.event.organizer.slug
} }
) )
@@ -3453,6 +3457,7 @@ def signal_listener_issue_giftcards(sender: Event, order: Order, **kwargs):
data={ data={
'value': trans.value, 'value': trans.value,
'acceptor_id': order.event.organizer.id, 'acceptor_id': order.event.organizer.id,
'acceptor_slug': order.event.organizer.slug
} }
) )
any_giftcards = True any_giftcards = True

6
src/pretix/control/views/organizer.py
View File

@@ -1850,7 +1850,8 @@ class GiftCardDetailView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMi
data={ data={
'value': value, 'value': value,
'text': request.POST.get('text'), 'text': request.POST.get('text'),
'acceptor_id': self.request.organizer.id 'acceptor_id': self.request.organizer.id,
'acceptor_slug': self.request.organizer.slug
}, },
user=self.request.user, user=self.request.user,
) )
@@ -1913,7 +1914,8 @@ class GiftCardCreateView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMi
user=self.request.user, user=self.request.user,
data={ data={
'value': form.cleaned_data['value'], 'value': form.cleaned_data['value'],
'acceptor_id': self.request.organizer.id 'acceptor_id': self.request.organizer.id,
'acceptor_slug': self.request.organizer.slug
} }
) )
return redirect(reverse( return redirect(reverse(