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

Order-related templates

Browse Source
This commit is contained in:
Raphael Michel
2018-07-09 00:14:22 +02:00
parent 0daded8af5
commit d583775132
16 changed files with 602 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pretix/control/templates/pretixcontrol/order/cancel.html
View File

@@ -4,9 +4,13 @@
{% trans "Cancel order" %} {% trans "Cancel order" %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1> <div class="panel panel-default">
<div class="panel-heading">
<h1 class="panel-title">
{% trans "Cancel order" %} {% trans "Cancel order" %}
</h1> </h1>
</div>
<div class="panel-body">
<p>{% blocktrans trimmed %} <p>{% blocktrans trimmed %}
Do you really want to cancel this order? You cannot revert this action. Do you really want to cancel this order? You cannot revert this action.
{% endblocktrans %}</p> {% endblocktrans %}</p>
@@ -35,4 +39,6 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</form> </form>
</div>
</div>
{% endblock %} {% endblock %}

31
src/pretix/control/templates/pretixcontrol/order/change.html
View File

@@ -7,27 +7,33 @@
{% endblocktrans %} {% endblocktrans %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1> <div class="panel panel-default panel-with-btn">
{% blocktrans trimmed with code=order.code %} <div class="panel-heading">
Change order: {{ code }} <a class="btn btn-default btn-sm pull-right"
{% endblocktrans %}
<a class="btn btn-link btn-lg"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}"> href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% blocktrans trimmed with order=order.code %} {% blocktrans trimmed with order=order.code %}
Back to order {{ order }} Back to order {{ order }}
{% endblocktrans %} {% endblocktrans %}
</a> </a>
<h1 class="panel-title">
{% blocktrans trimmed with code=order.code %}
Change order: {{ code }}
{% endblocktrans %}
</h1> </h1>
</div>
<div class="panel-body">
<p> <p>
{% blocktrans trimmed %} {% blocktrans trimmed %}
You can use this tool to change the ordered products or to partially cancel the order. Please keep You can use this tool to change the ordered products or to partially cancel the order. Please keep
in mind that changing an order can have several implications, e.g. the payment method fee might change or in mind that changing an order can have several implications, e.g. the payment method fee might
change or
additional questions can be added to the order that need to be answered by the user. additional questions can be added to the order that need to be answered by the user.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
<p> <p>
{% blocktrans trimmed %} {% blocktrans trimmed %}
The user will receive a notification about the change but in the case of new required questions, the user The user will receive a notification about the change but in the case of new required questions, the
user
will not be forced to answer them. will not be forced to answer them.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
@@ -38,18 +44,23 @@
</p> </p>
<p> <p>
{% blocktrans trimmed %} {% blocktrans trimmed %}
If you chose "split into new order" for multiple positions, they will be all split in one second order If you chose "split into new order" for multiple positions, they will be all split in one second
order
together, not multiple orders. together, not multiple orders.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
<div class="alert alert-warning"><strong> <div class="alert alert-warning"><strong>
{% blocktrans trimmed %} {% blocktrans trimmed %}
Please use this tool carefully. Changes you make here are not reversible. Also, if you change an order Please use this tool carefully. Changes you make here are not reversible. Also, if you change an
manually, not all constraints (e.g. on required add-ons) will be checked. Therefore, you might construct order
manually, not all constraints (e.g. on required add-ons) will be checked. Therefore, you might
construct
an order that would not be able to exist otherwise. an order that would not be able to exist otherwise.
In most cases it is easier to cancel the order completely and create a new one. In most cases it is easier to cancel the order completely and create a new one.
{% endblocktrans %} {% endblocktrans %}
</strong></div> </strong></div>
</div>
</div>
<form method="post" href=""> <form method="post" href="">
{% csrf_token %} {% csrf_token %}
{% for position in positions %} {% for position in positions %}

15
src/pretix/control/templates/pretixcontrol/order/change_contact.html
View File

@@ -5,19 +5,22 @@
{% trans "Change contact information" %} {% trans "Change contact information" %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1> <div class="panel panel-default panel-with-btn">
{% trans "Change contact information" %} <div class="panel-heading">
<a class="btn btn-link btn-lg" <a class="btn btn-default btn-sm pull-right"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}"> href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% blocktrans trimmed with order=order.code %} {% blocktrans trimmed with order=order.code %}
Back to order {{ order }} Back to order {{ order }}
{% endblocktrans %} {% endblocktrans %}
</a> </a>
<h1 class="panel-title">
{% trans "Change contact information" %}
</h1> </h1>
</div>
<div class="panel-body">
<form method="post" class="form-horizontal" href=""> <form method="post" class="form-horizontal" href="">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="status" value="c" /> <input type="hidden" name="status" value="c"/>
{% bootstrap_form form layout='horizontal' %} {% bootstrap_form form layout='horizontal' %}
<div class="form-group submit-group"> <div class="form-group submit-group">
<a class="btn btn-default btn-lg" <a class="btn btn-default btn-lg"
@@ -30,4 +33,6 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</form> </form>
</div>
</div>
{% endblock %} {% endblock %}

12
src/pretix/control/templates/pretixcontrol/order/change_locale.html
View File

@@ -5,15 +5,19 @@
{% trans "Change locale information" %} {% trans "Change locale information" %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1> <div class="panel panel-default panel-with-btn">
{% trans "Change locale information" %} <div class="panel-heading">
<a class="btn btn-link btn-lg" <a class="btn btn-default btn-sm pull-right"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}"> href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% blocktrans trimmed with order=order.code %} {% blocktrans trimmed with order=order.code %}
Back to order {{ order }} Back to order {{ order }}
{% endblocktrans %} {% endblocktrans %}
</a> </a>
<h1 class="panel-title">
{% trans "Change locale information" %}
</h1> </h1>
</div>
<div class="panel-body">
<p> <p>
{% blocktrans trimmed %} {% blocktrans trimmed %}
This language will be used whenever emails are sent to the users. This language will be used whenever emails are sent to the users.
@@ -35,4 +39,6 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</form> </form>
</div>
</div>
{% endblock %} {% endblock %}

15
src/pretix/control/templates/pretixcontrol/order/change_questions.html
View File

@@ -5,24 +5,29 @@
{% trans "Change contact information" %} {% trans "Change contact information" %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1> <div class="panel panel-default panel-with-btn">
{% trans "Change order information" %} <div class="panel-heading">
<a class="btn btn-link btn-lg" <a class="btn btn-default btn-sm pull-right"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}"> href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% blocktrans trimmed with order=order.code %} {% blocktrans trimmed with order=order.code %}
Back to order {{ order }} Back to order {{ order }}
{% endblocktrans %} {% endblocktrans %}
</a> </a>
<h1 class="panel-title">
{% trans "Change order information" %}
</h1> </h1>
</div>
</div>
<form method="post" class="form-horizontal" href="" enctype="multipart/form-data"> <form method="post" class="form-horizontal" href="" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
<div class="panel-group" id="questions_accordion"> <div class="" id="questions_accordion">
{% if request.event.settings.invoice_address_asked or order.invoice_address or request.event.settings.invoice_name_required %} {% if request.event.settings.invoice_address_asked or order.invoice_address or request.event.settings.invoice_name_required %}
<details class="panel panel-default" open> <details class="panel panel-default" open>
<summary class="panel-heading"> <summary class="panel-heading">
<h4 class="panel-title"> <h4 class="panel-title">
<strong>{% trans "Invoice information" %} {% if not request.event.settings.invoice_address_required %} <strong>{% trans "Invoice information" %}
{% if not request.event.settings.invoice_address_required %}
{% trans "(optional)" %} {% trans "(optional)" %}
{% endif %}</strong> {% endif %}</strong>
<i class="fa fa-angle-down collapse-indicator"></i> <i class="fa fa-angle-down collapse-indicator"></i>

15
src/pretix/control/templates/pretixcontrol/order/extend.html
View File

@@ -5,19 +5,22 @@
{% trans "Extend payment term" %} {% trans "Extend payment term" %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1> <div class="panel panel-default panel-with-btn">
{% trans "Extend payment term" %} <div class="panel-heading">
<a class="btn btn-link btn-lg" <a class="btn btn-default btn-sm pull-right"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}"> href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% blocktrans trimmed with order=order.code %} {% blocktrans trimmed with order=order.code %}
Back to order {{ order }} Back to order {{ order }}
{% endblocktrans %} {% endblocktrans %}
</a> </a>
<h1 class="panel-title">
{% trans "Extend payment term" %}
</h1> </h1>
</div>
<div class="panel-body">
<form method="post" class="form-horizontal" href=""> <form method="post" class="form-horizontal" href="">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="status" value="c" /> <input type="hidden" name="status" value="c"/>
{% bootstrap_form form layout='horizontal' %} {% bootstrap_form form layout='horizontal' %}
<div class="form-group submit-group"> <div class="form-group submit-group">
<a class="btn btn-default btn-lg" <a class="btn btn-default btn-lg"
@@ -30,4 +33,6 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</form> </form>
</div>
</div>
{% endblock %} {% endblock %}

14
src/pretix/control/templates/pretixcontrol/order/mail_history.html
View File

@@ -3,16 +3,18 @@
{% load bootstrap3 %} {% load bootstrap3 %}
{% block title %}{% trans "Email history" %}{% endblock %} {% block title %}{% trans "Email history" %}{% endblock %}
{% block content %} {% block content %}
<h1> <div class="panel panel-default panel-with-btn">
{% trans "Email history" %} <div class="panel-heading">
<a class="btn btn-link btn-lg" <a class="btn btn-default btn-sm pull-right"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}"> href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% blocktrans trimmed with order=order.code %} {% blocktrans trimmed with order=order.code %}
Back to order {{ order }} Back to order {{ order }}
{% endblocktrans %} {% endblocktrans %}
</a> </a>
<h1 class="panel-title">
{% trans "Email history" %}
</h1> </h1>
<div> </div>
<ul class="list-group"> <ul class="list-group">
{% for log in logs %} {% for log in logs %}
<li class="list-group-item logentry"> <li class="list-group-item logentry">
@@ -55,6 +57,8 @@
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> <div class="panel-footer">
{% include "pretixcontrol/pagination.html" %} {% include "pretixcontrol/pagination.html" %}
</div>
</div>
{% endblock %} {% endblock %}

14
src/pretix/control/templates/pretixcontrol/order/pay.html
View File

@@ -5,22 +5,26 @@
{% trans "Mark order as paid" %} {% trans "Mark order as paid" %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1> <div class="panel panel-default panel-with-btn">
{% trans "Mark order as paid" %} <div class="panel-heading">
<a class="btn btn-link btn-lg" <a class="btn btn-default btn-sm pull-right"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}"> href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% blocktrans trimmed with order=order.code %} {% blocktrans trimmed with order=order.code %}
Back to order {{ order }} Back to order {{ order }}
{% endblocktrans %} {% endblocktrans %}
</a> </a>
<h1 class="panel-title">
{% trans "Mark order as paid" %}
</h1> </h1>
</div>
<div class="panel-body">
<form method="post" class="form-horizontal" href=""> <form method="post" class="form-horizontal" href="">
{% csrf_token %} {% csrf_token %}
<p>{% blocktrans trimmed %} <p>{% blocktrans trimmed %}
Do you really want to mark this order as paid? Do you really want to mark this order as paid?
{% endblocktrans %}</p> {% endblocktrans %}</p>
<input type="hidden" name="status" value="p" /> <input type="hidden" name="status" value="p"/>
{% bootstrap_form form layout='horizontal' horizontal_label_class='sr-only' horizontal_field_class='col-md-12' %} {% bootstrap_form form layout='horizontal' horizontal_label_class='sr-only' horizontal_field_class='col-md-12' %}
<div class="form-group submit-group"> <div class="form-group submit-group">
<a class="btn btn-default btn-lg" <a class="btn btn-default btn-lg"
@@ -33,4 +37,6 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</form> </form>
</div>
</div>
{% endblock %} {% endblock %}

14
src/pretix/control/templates/pretixcontrol/order/refund.html
View File

@@ -4,15 +4,19 @@
{% trans "Refund order" %} {% trans "Refund order" %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1> <div class="panel panel-default panel-with-btn">
{% trans "Refund order" %} <div class="panel-heading">
<a class="btn btn-link btn-lg" <a class="btn btn-default btn-sm pull-right"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}"> href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% blocktrans trimmed with order=order.code %} {% blocktrans trimmed with order=order.code %}
Back to order {{ order }} Back to order {{ order }}
{% endblocktrans %} {% endblocktrans %}
</a> </a>
<h1 class="panel-title">
{% trans "Refund order" %}
</h1> </h1>
</div>
<div class="panel-body">
<form method="post" href=""> <form method="post" href="">
<p>{% blocktrans trimmed %} <p>{% blocktrans trimmed %}
Do you really want to refund this order? You cannot revert this action. Do you really want to refund this order? You cannot revert this action.
@@ -21,7 +25,7 @@
{{ payment|safe }} {{ payment|safe }}
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="status" value="r" /> <input type="hidden" name="status" value="r"/>
<div class="row checkout-button-row"> <div class="row checkout-button-row">
<div class="col-md-4"> <div class="col-md-4">
<a class="btn btn-block btn-default btn-lg" <a class="btn btn-block btn-default btn-lg"
@@ -37,4 +41,6 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</form> </form>
</div>
</div>
{% endblock %} {% endblock %}

46
src/pretix/control/templates/pretixcontrol/order/sendmail.html
View File

@@ -3,35 +3,24 @@
{% load bootstrap3 %} {% load bootstrap3 %}
{% block title %}{% trans "Send email" %}{% endblock %} {% block title %}{% trans "Send email" %}{% endblock %}
{% block content %} {% block content %}
<h1> <div class="panel panel-default panel-with-btn">
{% trans "Send email" %} <div class="panel-heading">
<a class="btn btn-link btn-lg" <a class="btn btn-default btn-sm pull-right"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}"> href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% blocktrans trimmed with order=order.code %} {% blocktrans trimmed with order=order.code %}
Back to order {{ order }} Back to order {{ order }}
{% endblocktrans %} {% endblocktrans %}
</a> </a>
<h1 class="panel-title">
{% trans "Send email" %}
</h1> </h1>
{% block inner %} </div>
<div class="panel-body">
<form class="form-horizontal" method="post" action=""> <form class="form-horizontal" method="post" action="">
{% csrf_token %} {% csrf_token %}
{% bootstrap_field form.sendto layout='horizontal' %} {% bootstrap_field form.sendto layout='horizontal' %}
{% bootstrap_field form.subject layout='horizontal' %} {% bootstrap_field form.subject layout='horizontal' %}
{% bootstrap_field form.message layout='horizontal' %} {% bootstrap_field form.message layout='horizontal' %}
{% if request.method == "POST" %}
<fieldset>
<legend>{% trans "E-mail preview" %}</legend>
<div class="tab-pane mail-preview-group">
<pre lang="" class="mail-preview">
{% for segment in preview_output %}
{% spaceless %}
{{ segment|linebreaksbr }}
{% endspaceless %}
{% endfor %}
</pre>
</div>
</fieldset>
{% endif %}
<div class="form-group submit-group"> <div class="form-group submit-group">
<button type="submit" class="btn btn-default btn-save pull-left" name="action" value="preview"> <button type="submit" class="btn btn-default btn-save pull-left" name="action" value="preview">
{% trans "Preview email" %} {% trans "Preview email" %}
@@ -41,5 +30,24 @@
</button> </button>
</div> </div>
</form> </form>
{% endblock %} </div>
</div>
{% if request.method == "POST" %}
<fieldset class="panel panel-default">
<div class="panel-heading">
<legend>{% trans "E-mail preview" %}</legend>
</div>
<div class="panel-body">
<div class="tab-pane mail-preview-group">
<pre lang="" class="mail-preview">
{% for segment in preview_output %}
{% spaceless %}
{{ segment|linebreaksbr }}
{% endspaceless %}
{% endfor %}
</pre>
</div>
</div>
</fieldset>
{% endif %}
{% endblock %} {% endblock %}

7
src/pretix/control/templates/pretixcontrol/orders/export.html
View File

@@ -4,12 +4,11 @@
{% load order_overview %} {% load order_overview %}
{% block title %}{% trans "Data export" %}{% endblock %} {% block title %}{% trans "Data export" %}{% endblock %}
{% block content %} {% block content %}
<h1>
{% trans "Data export" %}
{% if "identifier" in request.GET %} {% if "identifier" in request.GET %}
<p class="text-right">
<a href="?" class="btn btn-default">{% trans "Show all" %}</a> <a href="?" class="btn btn-default">{% trans "Show all" %}</a>
</p>
{% endif %} {% endif %}
</h1>
{% for e in exporters %} {% for e in exporters %}
<details class="panel panel-default" {% if "identifier" in request.GET %}open{% endif %}> <details class="panel panel-default" {% if "identifier" in request.GET %}open{% endif %}>
<summary class="panel-heading"> <summary class="panel-heading">
@@ -24,7 +23,7 @@
method="post" class="form-horizontal" data-asynctask data-asynctask-download method="post" class="form-horizontal" data-asynctask data-asynctask-download
data-asynctask-long> data-asynctask-long>
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="exporter" value="{{ e.identifier }}" /> <input type="hidden" name="exporter" value="{{ e.identifier }}"/>
{% bootstrap_form e.form layout='horizontal' %} {% bootstrap_form e.form layout='horizontal' %}
<button class="btn btn-primary pull-right" type="submit"> <button class="btn btn-primary pull-right" type="submit">
<span class="icon icon-upload"></span> {% trans "Start export" %} <span class="icon icon-upload"></span> {% trans "Start export" %}

44
src/pretix/control/templates/pretixcontrol/orders/index.html
View File

@@ -6,9 +6,12 @@
{% load bootstrap3 %} {% load bootstrap3 %}
{% block title %}{% trans "Orders" %}{% endblock %} {% block title %}{% trans "Orders" %}{% endblock %}
{% block content %} {% block content %}
<h1>{% trans "Orders" %}</h1> <div class="panel panel-default">
<div class="panel-heading">
<h1 class="panel-title">{% trans "Orders" %}</h1>
</div>
{% if not filter_form.filtered and orders|length == 0 %} {% if not filter_form.filtered and orders|length == 0 %}
<div class="empty-collection"> <div class="empty-collection panel-body">
<p> <p>
{% blocktrans trimmed %} {% blocktrans trimmed %}
Nobody ordered a ticket yet. Nobody ordered a ticket yet.
@@ -27,11 +30,13 @@
{% endif %} {% endif %}
</div> </div>
{% else %} {% else %}
<div class="panel-body">
<div class="row filter-form"> <div class="row filter-form">
<form class="col-md-2 col-xs-12" <form class="col-md-2 col-xs-12"
action="{% url "control:event.orders.go" event=request.event.slug organizer=request.event.organizer.slug %}"> action="{% url "control:event.orders.go" event=request.event.slug organizer=request.event.organizer.slug %}">
<div class="input-group"> <div class="input-group">
<input type="text" name="code" class="form-control" placeholder="{% trans "Order code" %}" autofocus> <input type="text" name="code" class="form-control" placeholder="{% trans "Order code" %}"
autofocus>
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-primary" type="submit">{% trans "Go!" %}</button> <button class="btn btn-primary" type="submit">{% trans "Go!" %}</button>
</span> </span>
@@ -78,35 +83,45 @@
{% blocktrans trimmed with question=filter_form.cleaned_data.question.question %} {% blocktrans trimmed with question=filter_form.cleaned_data.question.question %}
List filtered by answers to question "{{ question }}". List filtered by answers to question "{{ question }}".
{% endblocktrans %} {% endblocktrans %}
<a href="?{% url_replace request 'question' '' 'answer' ''%}" class="text-muted"> <a href="?{% url_replace request 'question' '' 'answer' '' %}" class="text-muted">
<span class="fa fa-times"></span> <span class="fa fa-times"></span>
{% trans "Remove filter" %} {% trans "Remove filter" %}
</a> </a>
</p> </p>
{% endif %} {% endif %}
</div>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-condensed table-hover"> <table class="table table-condensed table-hover">
<thead> <thead>
<tr> <tr>
<th>{% trans "Order code" %} <th>{% trans "Order code" %}
<a href="?{% url_replace request 'ordering' '-code' %}"><i class="fa fa-caret-down"></i></a> <a href="?{% url_replace request 'ordering' '-code' %}"><i class="fa fa-caret-down"></i></a>
<a href="?{% url_replace request 'ordering' 'code' %}"><i class="fa fa-caret-up"></i></a></th> <a href="?{% url_replace request 'ordering' 'code' %}"><i class="fa fa-caret-up"></i></a>
</th>
<th>{% trans "User" %} <th>{% trans "User" %}
<a href="?{% url_replace request 'ordering' '-email' %}"><i class="fa fa-caret-down"></i></a> <a href="?{% url_replace request 'ordering' '-email' %}"><i
<a href="?{% url_replace request 'ordering' 'email' %}"><i class="fa fa-caret-up"></i></a></th> class="fa fa-caret-down"></i></a>
<a href="?{% url_replace request 'ordering' 'email' %}"><i class="fa fa-caret-up"></i></a>
</th>
<th>{% trans "Order date" %} <th>{% trans "Order date" %}
<a href="?{% url_replace request 'ordering' '-datetime' %}"><i class="fa fa-caret-down"></i></a> <a href="?{% url_replace request 'ordering' '-datetime' %}"><i class="fa fa-caret-down"></i></a>
<a href="?{% url_replace request 'ordering' 'datetime' %}"><i class="fa fa-caret-up"></i></a> <a href="?{% url_replace request 'ordering' 'datetime' %}"><i
class="fa fa-caret-up"></i></a>
</th> </th>
<th class="text-right">{% trans "Order total" %} <th class="text-right">{% trans "Order total" %}
<a href="?{% url_replace request 'ordering' '-total' %}"><i class="fa fa-caret-down"></i></a> <a href="?{% url_replace request 'ordering' '-total' %}"><i
<a href="?{% url_replace request 'ordering' 'total' %}"><i class="fa fa-caret-up"></i></a></th> class="fa fa-caret-down"></i></a>
<a href="?{% url_replace request 'ordering' 'total' %}"><i class="fa fa-caret-up"></i></a>
</th>
<th class="text-right">{% trans "Positions" %} <th class="text-right">{% trans "Positions" %}
<a href="?{% url_replace request 'ordering' '-pcnt' %}"><i class="fa fa-caret-down"></i></a> <a href="?{% url_replace request 'ordering' '-pcnt' %}"><i class="fa fa-caret-down"></i></a>
<a href="?{% url_replace request 'ordering' 'pcnt' %}"><i class="fa fa-caret-up"></i></a></th> <a href="?{% url_replace request 'ordering' 'pcnt' %}"><i class="fa fa-caret-up"></i></a>
</th>
<th class="text-right">{% trans "Status" %} <th class="text-right">{% trans "Status" %}
<a href="?{% url_replace request 'ordering' '-status' %}"><i class="fa fa-caret-down"></i></a> <a href="?{% url_replace request 'ordering' '-status' %}"><i
<a href="?{% url_replace request 'ordering' 'status' %}"><i class="fa fa-caret-up"></i></a></th> class="fa fa-caret-down"></i></a>
<a href="?{% url_replace request 'ordering' 'status' %}"><i class="fa fa-caret-up"></i></a>
</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -135,6 +150,9 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="panel-footer">
{% include "pretixcontrol/pagination.html" %} {% include "pretixcontrol/pagination.html" %}
</div>
{% endif %} {% endif %}
</div>
{% endblock %} {% endblock %}

24
src/pretix/control/templates/pretixcontrol/orders/overview.html
View File

@@ -3,27 +3,38 @@
{% load order_overview %} {% load order_overview %}
{% block title %}{% trans "Sales overview" %}{% endblock %} {% block title %}{% trans "Sales overview" %}{% endblock %}
{% block content %} {% block content %}
<div class="panel panel-default panel-with-button">
<div class="panel-heading">
{% url "control:event.orders" organizer=request.event.organizer.slug event=request.event.slug as listurl %} {% url "control:event.orders" organizer=request.event.organizer.slug event=request.event.slug as listurl %}
<div class="pull-right"> <div class="pull-right">
<div class="btn-group" role="group" id="sumtoggle"> <div class="btn-group" role="group" id="sumtoggle">
<button type="button" data-target=".count" class="btn btn-default active">{% trans "Sales" %}</button> <button type="button" data-target=".count"
<button type="button" data-target=".sum-gross" class="btn btn-default">{% trans "Revenue (gross)" %}</button> class="btn btn-sm btn-default active">{% trans "Sales" %}</button>
<button type="button" data-target=".sum-net" class="btn btn-default">{% trans "Revenue (net)" %}</button> <button type="button" data-target=".sum-gross"
class="btn btn-sm btn-default">{% trans "Revenue (gross)" %}</button>
<button type="button" data-target=".sum-net"
class="btn btn-sm btn-default">{% trans "Revenue (net)" %}</button>
</div> </div>
</div> </div>
<h1>{% trans "Order overview" %}</h1> <h1 class="panel-title">{% trans "Order overview" %}</h1>
<div class="clearfix"></div>
</div>
{% if request.event.has_subevents %} {% if request.event.has_subevents %}
<form class="form-inline helper-display-inline" action="" method="get"> <form class="panel-body form-inline helper-display-inline" action="" method="get">
{% include "pretixcontrol/event/fragment_subevent_choice_simple.html" %} {% include "pretixcontrol/event/fragment_subevent_choice_simple.html" %}
</form> </form>
{% endif %} {% endif %}
{% if subevent_warning %} {% if subevent_warning %}
<div class="panel-body">
<div class="alert alert-info"> <div class="alert alert-info">
{% blocktrans trimmed context "subevent" %} {% blocktrans trimmed context "subevent" %}
If you select a single date, payment method fees will not be listed here as it might not be clear which If you select a single date, payment method fees will not be listed here as it might not be
clear
which
date they belong to. date they belong to.
{% endblocktrans %} {% endblocktrans %}
</div> </div>
</div>
{% endif %} {% endif %}
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-condensed table-hover table-product-overview"> <table class="table table-condensed table-hover table-product-overview">
@@ -119,4 +130,5 @@
</tfoot> </tfoot>
</table> </table>
</div> </div>
</div>
{% endblock %} {% endblock %}

14
src/pretix/control/templates/pretixcontrol/waitinglist/delete.html
View File

@@ -3,12 +3,18 @@
{% load bootstrap3 %} {% load bootstrap3 %}
{% block title %}{% trans "Delete entry" %}{% endblock %} {% block title %}{% trans "Delete entry" %}{% endblock %}
{% block content %} {% block content %}
<h1>{% trans "Delete entry" %}</h1> <div class="panel panel-default">
<div class="panel-heading">
<h1 class="panel-title">{% trans "Delete entry" %}</h1>
</div>
<div class="panel-body">
<form action="" method="post" class="form-horizontal"> <form action="" method="post" class="form-horizontal">
{% csrf_token %} {% csrf_token %}
<p>{% blocktrans %}Are you sure you want to delete the following waiting list entry <strong>{{ entry }}</strong>?{% endblocktrans %}</p> <p>{% blocktrans %}Are you sure you want to delete the following waiting list entry
<strong>{{ entry }}</strong>?{% endblocktrans %}</p>
<div class="form-group submit-group"> <div class="form-group submit-group">
<a href="{% url "control:event.orders.waitinglist" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel"> <a href="{% url "control:event.orders.waitinglist" organizer=request.event.organizer.slug event=request.event.slug %}"
class="btn btn-default btn-cancel">
{% trans "Cancel" %} {% trans "Cancel" %}
</a> </a>
<button type="submit" class="btn btn-danger btn-save"> <button type="submit" class="btn btn-danger btn-save">
@@ -16,4 +22,6 @@
</button> </button>
</div> </div>
</form> </form>
</div>
</div>
{% endblock %} {% endblock %}

26
src/pretix/control/templates/pretixcontrol/waitinglist/index.html
View File

@@ -5,7 +5,6 @@
{% load urlreplace %} {% load urlreplace %}
{% block title %}{% trans "Waiting list" %}{% endblock %} {% block title %}{% trans "Waiting list" %}{% endblock %}
{% block content %} {% block content %}
<h1>{% trans "Waiting list" %}</h1>
{% if not request.event.settings.waiting_list_enabled %} {% if not request.event.settings.waiting_list_enabled %}
<div class="alert alert-danger"> <div class="alert alert-danger">
{% trans "The waiting list is disabled, so if the event is sold out, people cannot add themselves to this list. If you want to enable it, go to the event settings." %} {% trans "The waiting list is disabled, so if the event is sold out, people cannot add themselves to this list. If you want to enable it, go to the event settings." %}
@@ -25,9 +24,12 @@
{% if request.event.settings.waiting_list_auto %} {% if request.event.settings.waiting_list_auto %}
<p> <p>
{% blocktrans trimmed %} {% blocktrans trimmed %}
You have configured that vouchers will automatically be sent to the persons on this list who waited You have configured that vouchers will automatically be sent to the persons on this
the longest as soon as capacity becomes available. It might take up to half an hour for the list who waited
vouchers to be sent after the capacity is available, so don't worry if entries do not disappear the longest as soon as capacity becomes available. It might take up to half an hour
for the
vouchers to be sent after the capacity is available, so don't worry if entries do
not disappear
here immediately. If you want, you can also send them out manually right now. here immediately. If you want, you can also send them out manually right now.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
@@ -75,7 +77,9 @@
</div> </div>
</div> </div>
<p> <div class="panel panel-default">
<div class="panel-heading"><h1 class="panel-title">{% trans "Waiting list" %}</h1></div>
<div class="panel-body">
<form class="form-inline helper-display-inline" action="" method="get"> <form class="form-inline helper-display-inline" action="" method="get">
<select name="status" class="form-control"> <select name="status" class="form-control">
<option value="a" <option value="a"
@@ -107,10 +111,9 @@
{% endif %} {% endif %}
<button class="btn btn-primary" type="submit">{% trans "Filter" %}</button> <button class="btn btn-primary" type="submit">{% trans "Filter" %}</button>
</form> </form>
</p> </div>
<form method="post" action="">
{% csrf_token %} {% csrf_token %}
<div class="table-responsive"> <form method="post" action="" class="table-responsive">
<table class="table table-condensed table-hover"> <table class="table table-condensed table-hover">
<thead> <thead>
<tr> <tr>
@@ -165,7 +168,8 @@
</td> </td>
<td> <td>
{% if not e.voucher %} {% if not e.voucher %}
<a href="{% url "control:event.orders.waitinglist.delete" organizer=request.event.organizer.slug event=request.event.slug entry=e.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a> <a href="{% url "control:event.orders.waitinglist.delete" organizer=request.event.organizer.slug event=request.event.slug entry=e.id %}"
class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
{% else %} {% else %}
<span class="btn btn-danger btn-sm disabled"><i class="fa fa-trash"></i></span> <span class="btn btn-danger btn-sm disabled"><i class="fa fa-trash"></i></span>
{% endif %} {% endif %}
@@ -176,7 +180,9 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
</div>
</form> </form>
<div class="panel-footer">
{% include "pretixcontrol/pagination.html" %} {% include "pretixcontrol/pagination.html" %}
</div>
</div>
{% endblock %} {% endblock %}

4
src/pretix/static/pretixcontrol/scss/_orders.scss
View File

@@ -20,10 +20,6 @@
} }
} }
#sumtoggle {
margin-top: 20px;
}
.logentry { .logentry {
.meta { .meta {
font-size: 12px; font-size: 12px;