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

Use columns on order detail page

Browse Source
This commit is contained in:
Raphael Michel
2016-03-22 12:15:43 +01:00
parent 3166b7fff2
commit 60506f68f0
1 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@
{% if i.is_cancellation %}{% trans "Cancellation" %}{% else %}{% trans "Invoice" %}{% endif %} {% if i.is_cancellation %}{% trans "Cancellation" %}{% else %}{% trans "Invoice" %}{% endif %}
{{ i.number }}</a> ({{ i.date|date:"SHORT_DATE_FORMAT" }}) {{ i.number }}</a> ({{ i.date|date:"SHORT_DATE_FORMAT" }})
{% if forloop.revcounter0 > 0 %} {% if forloop.revcounter0 > 0 %}
<br /> <br/>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</dd> </dd>
@@ -93,7 +93,7 @@
</dl> </dl>
</div> </div>
</div> </div>
<div class="panel panel-primary items"> <div class="panel panel-default items">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title"> <h3 class="panel-title">
{% trans "Ordered items" %} {% trans "Ordered items" %}
@@ -174,53 +174,59 @@
</div> </div>
</div> </div>
</div> </div>
<div class="panel panel-primary items"> <div class="row">
<div class="panel-heading"> <div class="{% if request.event.settings.invoice_address_asked %}col-md-6{% else %}col-md-12{% endif %}">
<h3 class="panel-title"> <div class="panel panel-default items">
{% trans "Payment information" %} <div class="panel-heading">
</h3> <h3 class="panel-title">
</div> {% trans "Payment information" %}
<div class="panel-body"> </h3>
{% if order.payment_manual %}
<div class="alert alert-info">
{% trans "The payment state of this order was manually modified." %}
</div> </div>
{% endif %} <div class="panel-body">
{{ payment }} {% if order.payment_manual %}
{% if order.status == 'n' %} <div class="alert alert-info">
<p>{% blocktrans trimmed with date=order.expires %} {% trans "The payment state of this order was manually modified." %}
The payment has to be completed before {{ date }}. </div>
{% endblocktrans %}</p>
{% endif %}
</div>
</div>
{% if request.event.settings.invoice_address_asked %}
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">
{% trans "Invoice information" %}
</h3>
</div>
<div class="panel-body">
<dl class="dl-horizontal">
<dt>{% trans "Company" %}</dt>
<dd>{{ order.invoice_address.company }}</dd>
<dt>{% trans "Name" %}</dt>
<dd>{{ order.invoice_address.name }}</dd>
<dt>{% trans "Address" %}</dt>
<dd>{{ order.invoice_address.street|linebreaksbr }}</dd>
<dt>{% trans "ZIP code and city" %}</dt>
<dd>{{ order.invoice_address.zipcode }} {{ addr.city }}</dd>
<dt>{% trans "Country" %}</dt>
<dd>{{ order.invoice_address.country }}</dd>
<dt>{% trans "Phone" %}</dt>
<dd>{{ order.invoice_address.phone }}</dd>
{% if request.event.settings.invoice_address_vatid %}
<dt>{% trans "VAT ID" %}</dt>
<dd>{{ order.invoice_address.vat_id }}</dd>
{% endif %} {% endif %}
</dl> {{ payment }}
{% if order.status == 'n' %}
<p>{% blocktrans trimmed with date=order.expires %}
The payment has to be completed before {{ date }}.
{% endblocktrans %}</p>
{% endif %}
</div>
</div> </div>
</div> </div>
{% endif %} {% if request.event.settings.invoice_address_asked %}
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
{% trans "Invoice information" %}
</h3>
</div>
<div class="panel-body">
<dl class="dl-horizontal">
<dt>{% trans "Company" %}</dt>
<dd>{{ order.invoice_address.company }}</dd>
<dt>{% trans "Name" %}</dt>
<dd>{{ order.invoice_address.name }}</dd>
<dt>{% trans "Address" %}</dt>
<dd>{{ order.invoice_address.street|linebreaksbr }}</dd>
<dt>{% trans "ZIP code and city" %}</dt>
<dd>{{ order.invoice_address.zipcode }} {{ addr.city }}</dd>
<dt>{% trans "Country" %}</dt>
<dd>{{ order.invoice_address.country }}</dd>
<dt>{% trans "Phone" %}</dt>
<dd>{{ order.invoice_address.phone }}</dd>
{% if request.event.settings.invoice_address_vatid %}
<dt>{% trans "VAT ID" %}</dt>
<dd>{{ order.invoice_address.vat_id }}</dd>
{% endif %}
</dl>
</div>
</div>
</div>
{% endif %}
</div>
{% endblock %} {% endblock %}