CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

API: Fix crash with missing body in some endpoints

Browse Source
This commit is contained in:
Raphael Michel
2023-04-16 14:10:14 +02:00
parent d19cdfb83f
commit a3fb10bcb0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pretix/api/views/order.py
View File

@@ -314,7 +314,7 @@ class OrderViewSet(viewsets.ModelViewSet):
@action(detail=True, methods=['POST']) @action(detail=True, methods=['POST'])
def mark_paid(self, request, **kwargs): def mark_paid(self, request, **kwargs):
order = self.get_object() order = self.get_object()
send_mail = request.data.get('send_email', True) send_mail = request.data.get('send_email', True) if request.data else True
if order.status in (Order.STATUS_PENDING, Order.STATUS_EXPIRED): if order.status in (Order.STATUS_PENDING, Order.STATUS_EXPIRED):
@@ -373,7 +373,7 @@ class OrderViewSet(viewsets.ModelViewSet):
@action(detail=True, methods=['POST']) @action(detail=True, methods=['POST'])
def mark_canceled(self, request, **kwargs): def mark_canceled(self, request, **kwargs):
send_mail = request.data.get('send_email', True) send_mail = request.data.get('send_email', True) if request.data else True
comment = request.data.get('comment', None) comment = request.data.get('comment', None)
cancellation_fee = request.data.get('cancellation_fee', None) cancellation_fee = request.data.get('cancellation_fee', None)
if cancellation_fee: if cancellation_fee:
@@ -432,7 +432,7 @@ class OrderViewSet(viewsets.ModelViewSet):
@action(detail=True, methods=['POST']) @action(detail=True, methods=['POST'])
def approve(self, request, **kwargs): def approve(self, request, **kwargs):
send_mail = request.data.get('send_email', True) send_mail = request.data.get('send_email', True) if request.data else True
order = self.get_object() order = self.get_object()
try: try:
@@ -450,7 +450,7 @@ class OrderViewSet(viewsets.ModelViewSet):
@action(detail=True, methods=['POST']) @action(detail=True, methods=['POST'])
def deny(self, request, **kwargs): def deny(self, request, **kwargs):
send_mail = request.data.get('send_email', True) send_mail = request.data.get('send_email', True) if request.data else True
comment = request.data.get('comment', '') comment = request.data.get('comment', '')
order = self.get_object() order = self.get_object()
@@ -1444,7 +1444,7 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
return order.payments.all() return order.payments.all()
def create(self, request, *args, **kwargs): def create(self, request, *args, **kwargs):
send_mail = request.data.get('send_email', True) send_mail = request.data.get('send_email', True) if request.data else True
serializer = OrderPaymentCreateSerializer(data=request.data, context=self.get_serializer_context()) serializer = OrderPaymentCreateSerializer(data=request.data, context=self.get_serializer_context())
serializer.is_valid(raise_exception=True) serializer.is_valid(raise_exception=True)
with transaction.atomic(): with transaction.atomic():
@@ -1489,7 +1489,7 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
def confirm(self, request, **kwargs): def confirm(self, request, **kwargs):
payment = self.get_object() payment = self.get_object()
force = request.data.get('force', False) force = request.data.get('force', False)
send_mail = request.data.get('send_email', True) send_mail = request.data.get('send_email', True) if request.data else True
if payment.state not in (OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED): if payment.state not in (OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED):
return Response({'detail': 'Invalid state of payment'}, status=status.HTTP_400_BAD_REQUEST) return Response({'detail': 'Invalid state of payment'}, status=status.HTTP_400_BAD_REQUEST)