From eafbe95370cbe0990541ed201d5bb62147ae3e60 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Sun, 10 Apr 2016 16:01:55 +0200 Subject: [PATCH] Fixed a problem with cancellations --- src/pretix/presale/views/async.py | 4 ++-- src/pretix/presale/views/order.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pretix/presale/views/async.py b/src/pretix/presale/views/async.py index 10b08fd19..25448f395 100644 --- a/src/pretix/presale/views/async.py +++ b/src/pretix/presale/views/async.py @@ -110,7 +110,7 @@ class AsyncAction: return JsonResponse({ 'ready': True, 'redirect': self.get_success_url(value), - 'message': self.get_success_message(value) + 'message': str(self.get_success_message(value)) }) return redirect(self.get_success_url(value)) @@ -120,7 +120,7 @@ class AsyncAction: return JsonResponse({ 'ready': True, 'redirect': self.get_error_url(), - 'message': self.get_error_message(exception) + 'message': str(self.get_error_message(exception)) }) return redirect(self.get_error_url()) diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py index 43896548f..06760d6e6 100644 --- a/src/pretix/presale/views/order.py +++ b/src/pretix/presale/views/order.py @@ -292,7 +292,7 @@ class OrderCancelDo(EventViewMixin, OrderDetailMixin, AsyncAction, View): def post(self, request, *args, **kwargs): if not self.order: raise Http404(_('Unknown order code or not authorized to access this order.')) - return self.do(self.order) + return self.do(self.order.pk) def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs)