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

Display all the question answers

Browse Source
This commit is contained in:
Raphael Michel
2015-03-12 23:03:04 +01:00
parent 8c802e534e
commit 1af3bb8328
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
{% load i18n %}
{% for line in cart.positions %}
<div class="row-fluid cart-row">
<div class="{% if line.has_questions %}col-md-9 col-xs-12{% else %}col-md-4 col-xs-6{% endif %}">
<div class="{% if line.has_questions %}col-md-9 col-xs-6{% else %}col-md-4 col-xs-6{% endif %}">
<strong>{{ line.item }}</strong>
{% if line.variation %}
– {{ line.variation }}

10
src/pretix/presale/templates/pretixpresale/event/order.html
View File

@@ -8,15 +8,15 @@
Your order: {{ code }}
{% endblocktrans %}
{% if order.status == "n" %}
<span class="label label-warning">{% trans "Payment pending" %}</span>
<span class="label label-warning pull-right">{% trans "Payment pending" %}</span>
{% elif order.status == "p" %}
<span class="label label-success">{% trans "Paid" %}</span>
<span class="label label-success pull-right">{% trans "Paid" %}</span>
{% elif order.status == "e" %}
<span class="label label-danger">{% trans "Payment pending" %}</span>
<span class="label label-danger pull-right">{% trans "Payment pending" %}</span>
{% elif order.status == "c" %}
<span class="label label-danger">{% trans "Cancelled" %}</span>
<span class="label label-danger pull-right">{% trans "Cancelled" %}</span>
{% elif order.status == "r" %}
<span class="label label-danger">{% trans "Refunded" %}</span>
<span class="label label-danger pull-right">{% trans "Refunded" %}</span>
{% endif %}
</h2>
{% if order.status == "n" %}

2
src/pretix/presale/views/checkout.py
View File

@@ -147,7 +147,7 @@ class CheckoutStart(EventViewMixin, CartDisplayMixin, EventLoginRequiredMixin, C
form.cartpos = form.cartpos.clone()
form.cartpos.attendee_name = v
form.cartpos.save()
elif k.startswith('question_'):
elif k.startswith('question_') and v is not None:
field = form.fields[k]
if hasattr(field, 'answer'):
# We already have a cached answer object, so we don't