From e537e4538aed0193ba7d5885ac16bd4352b75e36 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 31 Aug 2018 13:06:13 +0200 Subject: [PATCH] Fix limits for manual payment --- src/pretix/base/payment.py | 4 ++-- src/pretix/presale/checkoutflow.py | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/pretix/base/payment.py b/src/pretix/base/payment.py index 135e2e2b35..e177f2e82a 100644 --- a/src/pretix/base/payment.py +++ b/src/pretix/base/payment.py @@ -660,10 +660,10 @@ class ManualPayment(BasePaymentProvider): return 'pretix.plugins.manualpayment' not in self.event.plugins def is_allowed(self, request: HttpRequest, total: Decimal=None): - return 'pretix.plugins.manualpayment' in self.event.plugins + return 'pretix.plugins.manualpayment' in self.event.plugins and super().is_allowed(request, total) def order_change_allowed(self, order: Order): - return 'pretix.plugins.manualpayment' in self.event.plugins + return 'pretix.plugins.manualpayment' in self.event.plugins and super().order_change_allowed(order) @property def public_name(self): diff --git a/src/pretix/presale/checkoutflow.py b/src/pretix/presale/checkoutflow.py index bfea18d57f..eb8efbcb97 100644 --- a/src/pretix/presale/checkoutflow.py +++ b/src/pretix/presale/checkoutflow.py @@ -485,10 +485,7 @@ class PaymentStep(QuestionsViewMixin, CartMixin, TemplateFlowStep): return self.request.event.get_payment_providers().get(self.cart_session['payment']) def _is_allowed(self, prov, request): - try: - return prov.is_allowed(request, total=self._total_order_value) - except TypeError: - return prov.is_allowed(request, ) + return prov.is_allowed(request, total=self._total_order_value) def is_completed(self, request, warn=False): self.request = request