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

Merge branch 'master' of github.com:pretix/pretix

Browse Source
This commit is contained in:
Raphael Michel
2020-06-24 19:40:12 +02:00
parent e5cc15ffac 249e6978ea
commit 55670b92a8
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/base/settings.py
View File

@@ -812,7 +812,7 @@ DEFAULTS = {
'form_class': forms.IntegerField, 'form_class': forms.IntegerField,
'form_kwargs': dict( 'form_kwargs': dict(
label=_("Waiting list response time"), 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 " 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."), "number of hours until it expires and can be re-assigned to the next person on the list."),
widget=forms.NumberInput(), widget=forms.NumberInput(),

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

@@ -26,6 +26,10 @@
<p> <p>
<span class="fa fa-calendar"></span> <span class="fa fa-calendar"></span>
{{ form.cartpos.subevent.name }} &middot; {{ form.cartpos.subevent.get_date_range_display }} {{ 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> </p>
{% endif %} {% endif %}
{% for c in form.categories %} {% for c in form.categories %}

6
src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
View File

@@ -93,7 +93,11 @@
</label> </label>
<div class="col-md-9 form-control-text"> <div class="col-md-9 form-control-text">
<ul class="addon-list"> <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> </ul>
</div> </div>
</div> </div>