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

Do not show waiting list if presale is over

Browse Source
This commit is contained in:
Raphael Michel
2021-06-11 17:58:10 +02:00
parent 97d67d58d5
commit bb89bf68ef
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/presale/templates/pretixpresale/event/fragment_availability.html
View File

@@ -7,7 +7,7 @@
{% else %} {% else %}
<strong>{% trans "SOLD OUT" %}</strong> <strong>{% trans "SOLD OUT" %}</strong>
{% endif %} {% endif %}
{% if event.settings.waiting_list_enabled and item.allow_waitinglist %} {% if allow_waitinglist and item.allow_waitinglist %}
<br/> <br/>
<a href="{% eventurl event "presale:event.waitinglist" cart_namespace=cart_namespace|default_if_none:"" %}?item={{ item.pk }}{% if var %}&var={{ var.pk }}{% endif %}{% if subevent %}&subevent={{ subevent.pk }}{% endif %}"> <a href="{% eventurl event "presale:event.waitinglist" cart_namespace=cart_namespace|default_if_none:"" %}?item={{ item.pk }}{% if var %}&var={{ var.pk }}{% endif %}{% if subevent %}&subevent={{ subevent.pk }}{% endif %}">
<span class="fa fa-plus-circle" aria-hidden="true"></span> <span class="fa fa-plus-circle" aria-hidden="true"></span>
@@ -20,7 +20,7 @@
<strong>{% trans "Reserved" %}</strong> <strong>{% trans "Reserved" %}</strong>
<br/> <br/>
{% trans "All remaining products are reserved but might become available again." %} {% trans "All remaining products are reserved but might become available again." %}
{% if event.settings.waiting_list_enabled and item.allow_waitinglist %} {% if allow_waitinglist and item.allow_waitinglist %}
<br/> <br/>
<a href="{% eventurl event "presale:event.waitinglist" cart_namespace=cart_namespace|default_if_none:"" %}?item={{ item.pk }}{% if var %}&var={{ var.pk }}{% endif %}{% if subevent %}&subevent={{ subevent.pk }}{% endif %}"> <a href="{% eventurl event "presale:event.waitinglist" cart_namespace=cart_namespace|default_if_none:"" %}?item={{ item.pk }}{% if var %}&var={{ var.pk }}{% endif %}{% if subevent %}&subevent={{ subevent.pk }}{% endif %}">
<span class="fa fa-plus-circle" aria-hidden="true"></span> <span class="fa fa-plus-circle" aria-hidden="true"></span>

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

@@ -439,7 +439,8 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
context['ev'] = self.subevent or self.request.event 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'] = any(cp.has_addon_choices for cp in get_cart(self.request))\ context['has_addon_choices'] = any(cp.has_addon_choices for cp in get_cart(self.request))
context['allow_waitinglist'] = self.request.event.settings.waiting_list_enabled and context['ev'].presale_is_running
if self.subevent: if self.subevent:
context['frontpage_text'] = str(self.subevent.frontpage_text) context['frontpage_text'] = str(self.subevent.frontpage_text)

8
src/pretix/presale/views/waiting.py
View File

@@ -98,6 +98,14 @@ class WaitingView(EventViewMixin, FormView):
messages.error(request, _("Waiting lists are disabled for this event.")) messages.error(request, _("Waiting lists are disabled for this event."))
return redirect(self.get_index_url()) return redirect(self.get_index_url())
if self.request.event.presale_has_ended:
messages.error(request, _("The presale period for this event is over."))
return redirect(self.get_index_url())
if not self.request.event.presale_is_running:
messages.error(request, _("The presale for this event has not yet started."))
return redirect(self.get_index_url())
if not self.item_and_variation: if not self.item_and_variation:
messages.error(request, _("We could not identify the product you selected.")) messages.error(request, _("We could not identify the product you selected."))
return redirect(self.get_index_url()) return redirect(self.get_index_url())