CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-07 15:34:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refs #757: show voucher input for subevents only if subevent is selected (#777)

Browse Source 
* show voucher input for subevents only if subevent is selected

* move logic to python
This commit is contained in:
Felix Rindt
2018-02-22 09:44:53 +01:00
committed by Raphael Michel
parent e096898a05
commit 70fbbfe2a0
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/presale/templates/pretixpresale/event/index.html
View File

@@ -442,7 +442,7 @@
</form> </form>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if vouchers_exist %} {% if show_vouchers %}
<section class="front-page"> <section class="front-page">
<h3>{% trans "Redeem a voucher" %}</h3> <h3>{% trans "Redeem a voucher" %}</h3>
<form method="get" action="{% eventurl event "presale:event.redeem" cart_namespace=cart_namespace %}"> <form method="get" action="{% eventurl event "presale:event.redeem" cart_namespace=cart_namespace %}">

17
src/pretix/presale/views/event.py
View File

@@ -227,15 +227,20 @@ class EventIndex(EventViewMixin, CartMixin, TemplateView):
context['items_by_category'] = item_group_by_category(items) context['items_by_category'] = item_group_by_category(items)
context['display_add_to_cart'] = display_add_to_cart context['display_add_to_cart'] = display_add_to_cart
# Show voucher option if an event is selected and vouchers exist
vouchers_exist = self.request.event.cache.get('vouchers_exist')
if vouchers_exist is None:
vouchers_exist = self.request.event.vouchers.exists()
self.request.event.cache.set('vouchers_exist', vouchers_exist)
context['show_vouchers'] = vouchers_exist
else:
context['show_vouchers'] = False
context['ev'] = self.subevent or self.request.event
context['subevent'] = self.subevent context['subevent'] = self.subevent
context['cart'] = self.get_cart() context['cart'] = self.get_cart()
context['has_addon_choices'] = get_cart(self.request).filter(item__addons__isnull=False).exists() context['has_addon_choices'] = get_cart(self.request).filter(item__addons__isnull=False).exists()
vouchers_exist = self.request.event.cache.get('vouchers_exist')
if vouchers_exist is None:
vouchers_exist = self.request.event.vouchers.exists()
self.request.event.cache.set('vouchers_exist', vouchers_exist)
context['vouchers_exist'] = vouchers_exist
context['ev'] = self.subevent or self.request.event
if self.subevent: if self.subevent:
context['frontpage_text'] = str(self.subevent.frontpage_text) context['frontpage_text'] = str(self.subevent.frontpage_text)
else: else: