CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Allow dependencies between questions (#1202)

Browse Source 
- [x] data model
- [x] api
- [x] backend editor
- [x] backend validation logic
- [x] frontend display logic
- [x] frontend validation logic
- [x] test checkout step
- [x] test modify order in frontend
- [x] test modify order in backend
- [x] validation tests
- [x] correctly evaluate dependency tree in frontend?
- [x] copy events
This commit is contained in:
Raphael Michel
2019-03-13 16:49:20 +01:00
committed by GitHub
parent d10cbd07a7
commit f95e8f374d
22 changed files with 825 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pretix/presale/templates/pretixpresale/base.html
View File

@@ -26,6 +26,7 @@
<script type="text/javascript" src="{% static "bootstrap/js/bootstrap.js" %}"></script>
<script type="text/javascript" src="{% static "datetimepicker/bootstrap-datetimepicker.js" %}"></script>
<script type="text/javascript" src="{% static "pretixcontrol/js/jquery.qrcode.min.js" %}"></script>
<script type="text/javascript" src="{% static "pretixpresale/js/ui/questions.js" %}"></script>
<script type="text/javascript" src="{% static "pretixpresale/js/ui/main.js" %}"></script>
<script type="text/javascript" src="{% static "pretixbase/js/asynctask.js" %}"></script>
<script type="text/javascript" src="{% static "pretixbase/js/details.js" %}"></script>

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

@@ -65,7 +65,7 @@
</h4>
</summary>
<div>
<div class="panel-body" data-idx="{{ forloop.counter0 }}">
<div class="panel-body questions-form" data-idx="{{ forloop.counter0 }}">
{% if pos.addons.all %}
<div class="form-group">
<label class="col-md-3 control-label">
@@ -97,7 +97,7 @@
{# Add-Ons #}
<legend>+ {{ form.pos.item }}</legend>
{% endif %}
{% bootstrap_form form layout="horizontal" %}
{% bootstrap_form form layout="checkout" %}
{% endfor %}
</div>
</div>

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

@@ -53,13 +53,13 @@
</h4>
</summary>
<div id="cp{{ pos.id }}">
<div class="panel-body">
<div class="panel-body questions-form">
{% for form in forms %}
{% if form.pos.item != pos.item %}
{# Add-Ons #}
<legend>+ {{ form.pos.item }}</legend>
{% endif %}
{% bootstrap_form form layout="horizontal" %}
{% bootstrap_form form layout="checkout" %}
{% endfor %}
</div>
</div>