From a223d57124535f816485fab6986ec9925a17ce4f Mon Sep 17 00:00:00 2001
From: Martin Gross <gross@rami.io>
Date: Wed, 24 Jun 2020 13:26:38 +0200
Subject: [PATCH 1/2] Reduce minimal waitinglist voucher validity to 1 hour

---
 src/pretix/base/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py
index 835f8cda3..ad94d981e 100644
--- a/src/pretix/base/settings.py
+++ b/src/pretix/base/settings.py
@@ -812,7 +812,7 @@ DEFAULTS = {
         'form_class': forms.IntegerField,
         'form_kwargs': dict(
             label=_("Waiting list response time"),
-            min_value=6,
+            min_value=1,
             help_text=_("If a ticket voucher is sent to a person on the waiting list, it has to be redeemed within this "
                         "number of hours until it expires and can be re-assigned to the next person on the list."),
             widget=forms.NumberInput(),

From 249e6978ea6635ba93036c8adeeef1f9071a21e5 Mon Sep 17 00:00:00 2001
From: Martin Gross <gross@rami.io>
Date: Wed, 24 Jun 2020 17:06:25 +0200
Subject: [PATCH 2/2] Display subevent time for each item in addon and question
 step

---
 .../templates/pretixpresale/event/checkout_addons.html      | 4 ++++
 .../templates/pretixpresale/event/checkout_questions.html   | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html b/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html
index f84ec566f..d1d1b123f 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html
@@ -26,6 +26,10 @@
                                 <p>
                                     <span class="fa fa-calendar"></span>
                                     {{ form.cartpos.subevent.name }} &middot; {{ form.cartpos.subevent.get_date_range_display }}
+                                    {% if form.cartpos.event.settings.show_times %}
+                                        <span class="fa fa-clock-o"></span>
+                                        {{ form.cartpos.subevent.date_from|date:"TIME_FORMAT" }}
+                                    {% endif %}
                                 </p>
                             {% endif %}
                             {% for c in form.categories %}
diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
index b161bc04b..983ac9277 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
@@ -93,7 +93,11 @@
                                     </label>
                                     <div class="col-md-9 form-control-text">
                                         <ul class="addon-list">
-                                           {{ pos.subevent.name }} &middot; {{ pos.subevent.get_date_range_display }}
+                                            {{ pos.subevent.name }} &middot; {{ pos.subevent.get_date_range_display }}
+                                            {% if pos.event.settings.show_times %}
+                                                <span class="fa fa-clock-o"></span>
+                                                {{ pos.subevent.date_from|date:"TIME_FORMAT" }}
+                                            {% endif %}
                                         </ul>
                                     </div>
                                 </div>