From 938a1bca0d4a9e5b87aa9be828269314505b8970 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Tue, 2 May 2017 10:57:40 +0200 Subject: [PATCH] Button text change if addons are present --- .../presale/templates/pretixpresale/event/index.html | 7 ++++++- src/pretix/presale/views/__init__.py | 2 +- src/pretix/presale/views/event.py | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/pretix/presale/templates/pretixpresale/event/index.html b/src/pretix/presale/templates/pretixpresale/event/index.html index ddb246524..15ddac8bc 100644 --- a/src/pretix/presale/templates/pretixpresale/event/index.html +++ b/src/pretix/presale/templates/pretixpresale/event/index.html @@ -34,7 +34,12 @@
- {% trans "Proceed with checkout" %} + {% if has_addon_choices %} + {% trans "Continue" %} + + {% else %} + {% trans "Proceed with checkout" %} + {% endif %}
diff --git a/src/pretix/presale/views/__init__.py b/src/pretix/presale/views/__init__.py index 38896a8d4..813be0f97 100644 --- a/src/pretix/presale/views/__init__.py +++ b/src/pretix/presale/views/__init__.py @@ -109,7 +109,7 @@ class CartMixin: 'payment_fee_tax_rate': payment_fee_tax_rate, 'answers': answers, 'minutes_left': minutes_left, - 'first_expiry': first_expiry + 'first_expiry': first_expiry, } def get_payment_fee(self, total): diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py index 9725ebafd..0a9f7764d 100644 --- a/src/pretix/presale/views/event.py +++ b/src/pretix/presale/views/event.py @@ -21,7 +21,7 @@ from pytz import timezone from pretix.base.models import ItemVariation from pretix.multidomain.urlreverse import eventreverse -from . import CartMixin, EventViewMixin +from . import CartMixin, EventViewMixin, get_cart SessionStore = import_module(settings.SESSION_ENGINE).SessionStore @@ -108,6 +108,7 @@ class EventIndex(EventViewMixin, CartMixin, TemplateView): context['vouchers_exist'] = vouchers_exist context['cart'] = self.get_cart() + context['has_addon_choices'] = get_cart(self.request).filter(item__addons__isnull=False).exists() context['frontpage_text'] = str(self.request.event.settings.frontpage_text) return context