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

Improve display of attendee addresses

Browse Source
This commit is contained in:
Raphael Michel
2020-04-03 14:35:38 +02:00
parent 1ffc799c4d
commit 7d432f0639
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/control/templates/pretixcontrol/order/index.html
View File

@@ -402,9 +402,9 @@
</dt> </dt>
<dd> <dd>
{% if line.street or line.zipcode or line.city or line.country %} {% if line.street or line.zipcode or line.city or line.country %}
{{ line.street|linebreaksbr }}<br> {{ line.street|default_if_none:""|linebreaksbr }}<br>
{{ line.zipcode }} {{ line.city }}<br> {{ line.zipcode|default_if_none:"" }} {{ line.city|default_if_none:"" }}<br>
{{ line.country.name }} {{ line.country.name|default_if_none:"" }}
{% if line.state %}<br>{{ line.state }}{% endif %} {% if line.state %}<br>{{ line.state }}{% endif %}
{% else %} {% else %}
<em>{% trans "not answered" %}</em> <em>{% trans "not answered" %}</em>

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

@@ -63,6 +63,9 @@
</span> </span>
</dd> </dd>
{% endif %} {% endif %}
{% if line.item.admission and event.settings.attendee_addresses_asked %}
<br>
{% endif %}
{% if line.item.admission and event.settings.attendee_company_asked %} {% if line.item.admission and event.settings.attendee_company_asked %}
<dt class="sr-only"> <dt class="sr-only">
{% trans "Attendee company" %} {% trans "Attendee company" %}
@@ -80,9 +83,9 @@
<dd class="toplevel"> <dd class="toplevel">
<span data-toggle="tooltip" title="{% trans "Attendee address" %}"> <span data-toggle="tooltip" title="{% trans "Attendee address" %}">
{% if line.street or line.zipcode or line.city or line.country %} {% if line.street or line.zipcode or line.city or line.country %}
{{ line.street|linebreaksbr }}<br> {{ line.street|default_if_none:""|linebreaksbr }}<br>
{{ line.zipcode }} {{ line.city }}<br> {{ line.zipcode|default_if_none:"" }} {{ line.city|default_if_none:"" }}<br>
{{ line.country.name }} {{ line.country.name|default_if_none:"" }}
{% if line.state %}<br>{{ line.state }}{% endif %} {% if line.state %}<br>{{ line.state }}{% endif %}
{% else %} {% else %}
<em>{% trans "not answered" %}</em> <em>{% trans "not answered" %}</em>