Order-related templates

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

View File

@@ -4,35 +4,41 @@
{% trans "Cancel order" %} {% trans "Cancel order" %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1> <div class="panel panel-default">
{% trans "Cancel order" %} <div class="panel-heading">
</h1> <h1 class="panel-title">
<p>{% blocktrans trimmed %} {% trans "Cancel order" %}
Do you really want to cancel this order? You cannot revert this action. </h1>
{% endblocktrans %}</p> </div>
<div class="panel-body">
<p>{% blocktrans trimmed %}
Do you really want to cancel this order? You cannot revert this action.
{% endblocktrans %}</p>
<form method="post" href=""> <form method="post" href="">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="status" value="c"/> <input type="hidden" name="status" value="c"/>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="send_email" value="on" checked="checked"> <input type="checkbox" name="send_email" value="on" checked="checked">
{% trans "Notify user by e-mail" %} {% trans "Notify user by e-mail" %}
</label> </label>
</div>
<div class="row checkout-button-row">
<div class="col-md-4">
<a class="btn btn-block btn-default btn-lg"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% trans "No, take me back" %}
</a>
</div>
<div class="col-md-4 col-md-offset-4">
<button class="btn btn-block btn-danger btn-lg" type="submit">
{% trans "Yes, cancel order" %}
</button>
</div>
<div class="clearfix"></div>
</div>
</form>
</div> </div>
<div class="row checkout-button-row"> </div>
<div class="col-md-4">
<a class="btn btn-block btn-default btn-lg"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% trans "No, take me back" %}
</a>
</div>
<div class="col-md-4 col-md-offset-4">
<button class="btn btn-block btn-danger btn-lg" type="submit">
{% trans "Yes, cancel order" %}
</button>
</div>
<div class="clearfix"></div>
</div>
</form>
{% endblock %} {% endblock %}

View File

@@ -7,49 +7,60 @@
{% 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 %} href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
<a class="btn btn-link btn-lg" {% blocktrans trimmed with order=order.code %}
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}"> Back to order {{ order }}
{% blocktrans trimmed with order=order.code %} {% endblocktrans %}
Back to order {{ order }} </a>
{% endblocktrans %} <h1 class="panel-title">
</a> {% blocktrans trimmed with code=order.code %}
</h1> Change order: {{ code }}
<p> {% endblocktrans %}
{% blocktrans trimmed %} </h1>
You can use this tool to change the ordered products or to partially cancel the order. Please keep </div>
in mind that changing an order can have several implications, e.g. the payment method fee might change or <div class="panel-body">
additional questions can be added to the order that need to be answered by the user. <p>
{% endblocktrans %} {% blocktrans trimmed %}
</p> You can use this tool to change the ordered products or to partially cancel the order. Please keep
<p> in mind that changing an order can have several implications, e.g. the payment method fee might
{% blocktrans trimmed %} change or
The user will receive a notification about the change but in the case of new required questions, the user additional questions can be added to the order that need to be answered by the user.
will not be forced to answer them. {% 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
If an invoice is attached to the order, a cancellation will be created together with a new invoice. user
{% endblocktrans %} will not be forced to answer them.
</p> {% endblocktrans %}
<p> </p>
{% blocktrans trimmed %} <p>
If you chose "split into new order" for multiple positions, they will be all split in one second order {% blocktrans trimmed %}
together, not multiple orders. If an invoice is attached to the order, a cancellation will be created together with a new invoice.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
<div class="alert alert-warning"><strong> <p>
{% blocktrans trimmed %} {% blocktrans trimmed %}
Please use this tool carefully. Changes you make here are not reversible. Also, if you change an order If you chose "split into new order" for multiple positions, they will be all split in one second
manually, not all constraints (e.g. on required add-ons) will be checked. Therefore, you might construct order
an order that would not be able to exist otherwise. together, not multiple orders.
In most cases it is easier to cancel the order completely and create a new one. {% endblocktrans %}
{% endblocktrans %} </p>
</strong></div> <div class="alert alert-warning"><strong>
{% blocktrans trimmed %}
Please use this tool carefully. Changes you make here are not reversible. Also, if you change an
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.
In most cases it is easier to cancel the order completely and create a new one.
{% endblocktrans %}
</strong></div>
</div>
</div>
<form method="post" href=""> <form method="post" href="">
{% csrf_token %} {% csrf_token %}
{% for position in positions %} {% for position in positions %}
@@ -63,10 +74,10 @@
{% endif %} {% endif %}
{% if position.addon_to %} {% if position.addon_to %}
<em> <em>
{% blocktrans trimmed with posid=position.addon_to.positionid %} {% blocktrans trimmed with posid=position.addon_to.positionid %}
Add-On to position #{{ posid }} Add-On to position #{{ posid }}
{% endblocktrans %} {% endblocktrans %}
</em> </em>
{% endif %} {% endif %}
</h3> </h3>
</div> </div>
@@ -84,14 +95,14 @@
<div class="radio"> <div class="radio">
<label> <label>
<input name="{{ position.form.prefix }}-operation" type="radio" value="" <input name="{{ position.form.prefix }}-operation" type="radio" value=""
{% if not position.form.operation.value %}checked="checked"{% endif %}> {% if not position.form.operation.value %}checked="checked"{% endif %}>
{% trans "Keep unchanged" %} {% trans "Keep unchanged" %}
</label> </label>
</div> </div>
<div class="radio"> <div class="radio">
<label> <label>
<input name="{{ position.form.prefix }}-operation" type="radio" value="product" <input name="{{ position.form.prefix }}-operation" type="radio" value="product"
{% if position.form.operation.value == "product" %}checked="checked"{% endif %}> {% if position.form.operation.value == "product" %}checked="checked"{% endif %}>
{% trans "Change product to" %} {% trans "Change product to" %}
{% bootstrap_field position.form.itemvar layout='inline' %} {% bootstrap_field position.form.itemvar layout='inline' %}
</label> </label>
@@ -100,7 +111,7 @@
<div class="radio"> <div class="radio">
<label> <label>
<input name="{{ position.form.prefix }}-operation" type="radio" value="subevent" <input name="{{ position.form.prefix }}-operation" type="radio" value="subevent"
{% if position.form.operation.value == "subevent" %}checked="checked"{% endif %}> {% if position.form.operation.value == "subevent" %}checked="checked"{% endif %}>
{% trans "Change date to" context "subevent" %} {% trans "Change date to" context "subevent" %}
{% bootstrap_field position.form.subevent layout='inline' %} {% bootstrap_field position.form.subevent layout='inline' %}
</label> </label>
@@ -109,7 +120,7 @@
<div class="radio"> <div class="radio">
<label> <label>
<input name="{{ position.form.prefix }}-operation" type="radio" value="price" <input name="{{ position.form.prefix }}-operation" type="radio" value="price"
{% if position.form.operation.value == "price" %}checked="checked"{% endif %}> {% if position.form.operation.value == "price" %}checked="checked"{% endif %}>
{% trans "Change price to" %} {% trans "Change price to" %}
{% bootstrap_field position.form.price addon_after=request.event.currency layout='inline' %} {% bootstrap_field position.form.price addon_after=request.event.currency layout='inline' %}
{% if position.apply_tax %} {% if position.apply_tax %}
@@ -130,21 +141,21 @@
<div class="radio"> <div class="radio">
<label> <label>
<input name="{{ position.form.prefix }}-operation" type="radio" value="split" <input name="{{ position.form.prefix }}-operation" type="radio" value="split"
{% if position.form.operation.value == "split" %}checked="checked"{% endif %}> {% if position.form.operation.value == "split" %}checked="checked"{% endif %}>
{% trans "Split into new order" %} {% trans "Split into new order" %}
</label> </label>
</div> </div>
<div class="radio"> <div class="radio">
<label> <label>
<input name="{{ position.form.prefix }}-operation" type="radio" value="secret" <input name="{{ position.form.prefix }}-operation" type="radio" value="secret"
{% if position.form.operation.value == "secret" %}checked="checked"{% endif %}> {% if position.form.operation.value == "secret" %}checked="checked"{% endif %}>
{% trans "Generate a new secret" %} {% trans "Generate a new secret" %}
</label> </label>
</div> </div>
<div class="radio"> <div class="radio">
<label> <label>
<input name="{{ position.form.prefix }}-operation" type="radio" value="cancel" <input name="{{ position.form.prefix }}-operation" type="radio" value="cancel"
{% if position.form.operation.value == "cancel" %}checked="checked"{% endif %}> {% if position.form.operation.value == "cancel" %}checked="checked"{% endif %}>
{% trans "Remove from order" %} {% trans "Remove from order" %}
{% if position.addons.exists %} {% if position.addons.exists %}
<em class="text-danger"> <em class="text-danger">
@@ -204,7 +215,7 @@
</div> </div>
<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"
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 %}">
{% trans "Cancel" %} {% trans "Cancel" %}
</a> </a>
<button class="btn btn-primary btn-save btn-lg" type="submit"> <button class="btn btn-primary btn-save btn-lg" type="submit">

View File

@@ -5,29 +5,34 @@
{% 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>
</h1>
<form method="post" class="form-horizontal" href="">
{% csrf_token %}
<input type="hidden" name="status" value="c" />
{% bootstrap_form form layout='horizontal' %}
<div class="form-group submit-group">
<a class="btn btn-default btn-lg"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% trans "Cancel" %}
</a> </a>
<button class="btn btn-primary btn-save btn-lg" type="submit"> <h1 class="panel-title">
{% trans "Save" %} {% trans "Change contact information" %}
</button> </h1>
<div class="clearfix"></div>
</div> </div>
</form> <div class="panel-body">
<form method="post" class="form-horizontal" href="">
{% csrf_token %}
<input type="hidden" name="status" value="c"/>
{% bootstrap_form form layout='horizontal' %}
<div class="form-group submit-group">
<a class="btn btn-default btn-lg"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% trans "Cancel" %}
</a>
<button class="btn btn-primary btn-save btn-lg" type="submit">
{% trans "Save" %}
</button>
<div class="clearfix"></div>
</div>
</form>
</div>
</div>
{% endblock %} {% endblock %}

View File

@@ -5,34 +5,40 @@
{% 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>
</h1>
<p>
{% blocktrans trimmed %}
This language will be used whenever emails are sent to the users.
{% endblocktrans %}
</p>
<form method="post" class="form-horizontal" href="">
{% csrf_token %}
<input type="hidden" name="status" value="c"/>
{% bootstrap_form form layout='horizontal' %}
<div class="form-group submit-group">
<a class="btn btn-default btn-lg"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% trans "Cancel" %}
</a> </a>
<button class="btn btn-primary btn-save btn-lg" type="submit"> <h1 class="panel-title">
{% trans "Save" %} {% trans "Change locale information" %}
</button> </h1>
<div class="clearfix"></div>
</div> </div>
</form> <div class="panel-body">
<p>
{% blocktrans trimmed %}
This language will be used whenever emails are sent to the users.
{% endblocktrans %}
</p>
<form method="post" class="form-horizontal" href="">
{% csrf_token %}
<input type="hidden" name="status" value="c"/>
{% bootstrap_form form layout='horizontal' %}
<div class="form-group submit-group">
<a class="btn btn-default btn-lg"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% trans "Cancel" %}
</a>
<button class="btn btn-primary btn-save btn-lg" type="submit">
{% trans "Save" %}
</button>
<div class="clearfix"></div>
</div>
</form>
</div>
</div>
{% endblock %} {% endblock %}

View File

@@ -5,26 +5,31 @@
{% 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> <h1 class="panel-title">
{% trans "Change order information" %}
</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" %}
{% trans "(optional)" %} {% if not request.event.settings.invoice_address_required %}
{% endif %}</strong> {% trans "(optional)" %}
{% endif %}</strong>
<i class="fa fa-angle-down collapse-indicator"></i> <i class="fa fa-angle-down collapse-indicator"></i>
</h4> </h4>
</summary> </summary>
@@ -61,7 +66,7 @@
</div> </div>
<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"
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 %}">
{% trans "Cancel" %} {% trans "Cancel" %}
</a> </a>
<button class="btn btn-primary btn-save btn-lg" type="submit"> <button class="btn btn-primary btn-save btn-lg" type="submit">

View File

@@ -5,29 +5,34 @@
{% 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>
</h1>
<form method="post" class="form-horizontal" href="">
{% csrf_token %}
<input type="hidden" name="status" value="c" />
{% bootstrap_form form layout='horizontal' %}
<div class="form-group submit-group">
<a class="btn btn-default btn-lg"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% trans "Cancel" %}
</a> </a>
<button class="btn btn-danger btn-save btn-lg" type="submit"> <h1 class="panel-title">
{% trans "Save" %} {% trans "Extend payment term" %}
</button> </h1>
<div class="clearfix"></div>
</div> </div>
</form> <div class="panel-body">
<form method="post" class="form-horizontal" href="">
{% csrf_token %}
<input type="hidden" name="status" value="c"/>
{% bootstrap_form form layout='horizontal' %}
<div class="form-group submit-group">
<a class="btn btn-default btn-lg"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% trans "Cancel" %}
</a>
<button class="btn btn-danger btn-save btn-lg" type="submit">
{% trans "Save" %}
</button>
<div class="clearfix"></div>
</div>
</form>
</div>
</div>
{% endblock %} {% endblock %}

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> <h1 class="panel-title">
<div> {% trans "Email history" %}
</h1>
</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 class="panel-footer">
{% include "pretixcontrol/pagination.html" %}
</div>
</div> </div>
{% include "pretixcontrol/pagination.html" %}
{% endblock %} {% endblock %}

View File

@@ -5,32 +5,38 @@
{% 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>
</h1>
<form method="post" class="form-horizontal" href="">
{% csrf_token %}
<p>{% blocktrans trimmed %}
Do you really want to mark this order as paid?
{% endblocktrans %}</p>
<input type="hidden" name="status" value="p" />
{% bootstrap_form form layout='horizontal' horizontal_label_class='sr-only' horizontal_field_class='col-md-12' %}
<div class="form-group submit-group">
<a class="btn btn-default btn-lg"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% trans "Cancel" %}
</a> </a>
<button class="btn btn-primary btn-save btn-lg" type="submit"> <h1 class="panel-title">
{% trans "Mark as paid" %} {% trans "Mark order as paid" %}
</button> </h1>
<div class="clearfix"></div>
</div> </div>
</form> <div class="panel-body">
<form method="post" class="form-horizontal" href="">
{% csrf_token %}
<p>{% blocktrans trimmed %}
Do you really want to mark this order as paid?
{% endblocktrans %}</p>
<input type="hidden" name="status" value="p"/>
{% bootstrap_form form layout='horizontal' horizontal_label_class='sr-only' horizontal_field_class='col-md-12' %}
<div class="form-group submit-group">
<a class="btn btn-default btn-lg"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% trans "Cancel" %}
</a>
<button class="btn btn-primary btn-save btn-lg" type="submit">
{% trans "Mark as paid" %}
</button>
<div class="clearfix"></div>
</div>
</form>
</div>
</div>
{% endblock %} {% endblock %}

View File

@@ -4,37 +4,43 @@
{% 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> <h1 class="panel-title">
<form method="post" href=""> {% trans "Refund order" %}
<p>{% blocktrans trimmed %} </h1>
Do you really want to refund this order? You cannot revert this action.
{% endblocktrans %}</p>
{{ payment|safe }}
{% csrf_token %}
<input type="hidden" name="status" value="r" />
<div class="row checkout-button-row">
<div class="col-md-4">
<a class="btn btn-block btn-default btn-lg"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% trans "No, take me back" %}
</a>
</div>
<div class="col-md-4 col-md-offset-4">
<button class="btn btn-block btn-danger btn-lg" type="submit">
{% trans "Yes, refund order" %}
</button>
</div>
<div class="clearfix"></div>
</div> </div>
</form> <div class="panel-body">
<form method="post" href="">
<p>{% blocktrans trimmed %}
Do you really want to refund this order? You cannot revert this action.
{% endblocktrans %}</p>
{{ payment|safe }}
{% csrf_token %}
<input type="hidden" name="status" value="r"/>
<div class="row checkout-button-row">
<div class="col-md-4">
<a class="btn btn-block btn-default btn-lg"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% trans "No, take me back" %}
</a>
</div>
<div class="col-md-4 col-md-offset-4">
<button class="btn btn-block btn-danger btn-lg" type="submit">
{% trans "Yes, refund order" %}
</button>
</div>
<div class="clearfix"></div>
</div>
</form>
</div>
</div>
{% endblock %} {% endblock %}

View File

@@ -3,43 +3,51 @@
{% 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> <h1 class="panel-title">
{% block inner %} {% trans "Send email" %}
<form class="form-horizontal" method="post" action=""> </h1>
{% csrf_token %} </div>
{% bootstrap_field form.sendto layout='horizontal' %} <div class="panel-body">
{% bootstrap_field form.subject layout='horizontal' %} <form class="form-horizontal" method="post" action="">
{% bootstrap_field form.message layout='horizontal' %} {% csrf_token %}
{% if request.method == "POST" %} {% bootstrap_field form.sendto layout='horizontal' %}
<fieldset> {% bootstrap_field form.subject layout='horizontal' %}
<legend>{% trans "E-mail preview" %}</legend> {% bootstrap_field form.message layout='horizontal' %}
<div class="tab-pane mail-preview-group"> <div class="form-group submit-group">
<pre lang="" class="mail-preview"> <button type="submit" class="btn btn-default btn-save pull-left" name="action" value="preview">
{% for segment in preview_output %} {% trans "Preview email" %}
{% spaceless %} </button>
{{ segment|linebreaksbr }} <button type="submit" class="btn btn-primary btn-save">
{% endspaceless %} {% trans "Send" %}
{% endfor %} </button>
</pre> </div>
</div> </form>
</fieldset> </div>
{% endif %} </div>
<div class="form-group submit-group"> {% if request.method == "POST" %}
<button type="submit" class="btn btn-default btn-save pull-left" name="action" value="preview"> <fieldset class="panel panel-default">
{% trans "Preview email" %} <div class="panel-heading">
</button> <legend>{% trans "E-mail preview" %}</legend>
<button type="submit" class="btn btn-primary btn-save">
{% trans "Send" %}
</button>
</div> </div>
</form> <div class="panel-body">
{% endblock %} <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 %}

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> {% if "identifier" in request.GET %}
{% trans "Data export" %} <p class="text-right">
{% if "identifier" in request.GET %}
<a href="?" class="btn btn-default">{% trans "Show all" %}</a> <a href="?" class="btn btn-default">{% trans "Show all" %}</a>
{% endif %} </p>
</h1> {% endif %}
{% 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">
@@ -21,10 +20,10 @@
<div id="{{ e.identifier }}"> <div id="{{ e.identifier }}">
<div class="panel-body"> <div class="panel-body">
<form action="{% url "control:event.orders.export.do" event=request.event.slug organizer=request.organizer.slug %}" <form action="{% url "control:event.orders.export.do" event=request.event.slug organizer=request.organizer.slug %}"
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" %}

View File

@@ -6,135 +6,153 @@
{% 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">
{% if not filter_form.filtered and orders|length == 0 %} <div class="panel-heading">
<div class="empty-collection"> <h1 class="panel-title">{% trans "Orders" %}</h1>
<p>
{% blocktrans trimmed %}
Nobody ordered a ticket yet.
{% endblocktrans %}
</p>
{% if not request.event.live %}
<a href="{% url "control:event.live" event=request.event.slug organizer=request.event.organizer.slug %}"
class="btn btn-primary btn-lg">
{% trans "Take your shop live" %}
</a>
{% else %}
<a href="{% eventurl request.event "presale:event.index" %}" class="btn btn-primary btn-lg">
{% trans "Go to the ticket shop" %}
</a>
{% endif %}
</div> </div>
{% else %} {% if not filter_form.filtered and orders|length == 0 %}
<div class="row filter-form"> <div class="empty-collection panel-body">
<form class="col-md-2 col-xs-12" <p>
action="{% url "control:event.orders.go" event=request.event.slug organizer=request.event.organizer.slug %}"> {% blocktrans trimmed %}
<div class="input-group"> Nobody ordered a ticket yet.
<input type="text" name="code" class="form-control" placeholder="{% trans "Order code" %}" autofocus> {% endblocktrans %}
<span class="input-group-btn"> </p>
{% if not request.event.live %}
<a href="{% url "control:event.live" event=request.event.slug organizer=request.event.organizer.slug %}"
class="btn btn-primary btn-lg">
{% trans "Take your shop live" %}
</a>
{% else %}
<a href="{% eventurl request.event "presale:event.index" %}" class="btn btn-primary btn-lg">
{% trans "Go to the ticket shop" %}
</a>
{% endif %}
</div>
{% else %}
<div class="panel-body">
<div class="row filter-form">
<form class="col-md-2 col-xs-12"
action="{% url "control:event.orders.go" event=request.event.slug organizer=request.event.organizer.slug %}">
<div class="input-group">
<input type="text" name="code" class="form-control" placeholder="{% trans "Order code" %}"
autofocus>
<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>
</div> </div>
</form> </form>
<form class="" action="" method="get"> <form class="" action="" method="get">
<div class="col-md-2 col-xs-6"> <div class="col-md-2 col-xs-6">
{% bootstrap_field filter_form.status layout='inline' %} {% bootstrap_field filter_form.status layout='inline' %}
</div> </div>
{% if request.event.has_subevents %} {% if request.event.has_subevents %}
<div class="col-md-1 col-xs-6"> <div class="col-md-1 col-xs-6">
{% bootstrap_field filter_form.item layout='inline' %} {% bootstrap_field filter_form.item layout='inline' %}
</div> </div>
<div class="col-md-2 col-xs-6"> <div class="col-md-2 col-xs-6">
{% bootstrap_field filter_form.subevent layout='inline' %} {% bootstrap_field filter_form.subevent layout='inline' %}
</div> </div>
<div class="col-md-1 col-xs-6"> <div class="col-md-1 col-xs-6">
{% bootstrap_field filter_form.provider layout='inline' %} {% bootstrap_field filter_form.provider layout='inline' %}
</div> </div>
{% else %} {% else %}
<div class="col-md-2 col-xs-6"> <div class="col-md-2 col-xs-6">
{% bootstrap_field filter_form.item layout='inline' %} {% bootstrap_field filter_form.item layout='inline' %}
</div> </div>
<div class="col-md-2 col-xs-6"> <div class="col-md-2 col-xs-6">
{% bootstrap_field filter_form.provider layout='inline' %} {% bootstrap_field filter_form.provider layout='inline' %}
</div> </div>
{% endif %} {% endif %}
<div class="col-md-2 col-xs-6"> <div class="col-md-2 col-xs-6">
{% bootstrap_field filter_form.query layout='inline' %} {% bootstrap_field filter_form.query layout='inline' %}
</div> </div>
<div class="col-md-2 col-xs-6"> <div class="col-md-2 col-xs-6">
<button class="btn btn-primary btn-block" type="submit"> <button class="btn btn-primary btn-block" type="submit">
<span class="fa fa-filter"></span> <span class="fa fa-filter"></span>
<span class="hidden-md"> <span class="hidden-md">
{% trans "Filter" %} {% trans "Filter" %}
</span> </span>
</button> </button>
</div>
</form>
</div> </div>
</form> {% if filter_form.is_valid and filter_form.cleaned_data.question %}
</div> <p class="text-muted">
{% if filter_form.is_valid and filter_form.cleaned_data.question %} <span class="fa fa-filter"></span>
<p class="text-muted"> {% blocktrans trimmed with question=filter_form.cleaned_data.question.question %}
<span class="fa fa-filter"></span> List filtered by answers to question "{{ question }}".
{% blocktrans trimmed with question=filter_form.cleaned_data.question.question %} {% endblocktrans %}
List filtered by answers to question "{{ question }}". <a href="?{% url_replace request 'question' '' 'answer' '' %}" class="text-muted">
{% endblocktrans %} <span class="fa fa-times"></span>
<a href="?{% url_replace request 'question' '' 'answer' ''%}" class="text-muted"> {% trans "Remove filter" %}
<span class="fa fa-times"></span> </a>
{% trans "Remove filter" %} </p>
</a> {% endif %}
</p> </div>
{% endif %} <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>
<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-up"></i></a></th>
<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 class="fa fa-caret-up"></i></a></th>
<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-up"></i></a>
</th>
<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 class="fa fa-caret-up"></i></a></th>
<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-up"></i></a></th>
<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 class="fa fa-caret-up"></i></a></th>
</tr>
</thead>
<tbody>
{% for o in orders %}
<tr> <tr>
<td> <th>{% trans "Order code" %}
<strong> <a href="?{% url_replace request 'ordering' '-code' %}"><i class="fa fa-caret-down"></i></a>
<a <a href="?{% url_replace request 'ordering' 'code' %}"><i class="fa fa-caret-up"></i></a>
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=o.code %}"> </th>
{{ o.code }} <th>{% trans "User" %}
</a> <a href="?{% url_replace request 'ordering' '-email' %}"><i
</strong> class="fa fa-caret-down"></i></a>
</td> <a href="?{% url_replace request 'ordering' 'email' %}"><i class="fa fa-caret-up"></i></a>
<td> </th>
{{ o.email|default_if_none:"" }} <th>{% trans "Order date" %}
{% if o.invoice_address.name %} <a href="?{% url_replace request 'ordering' '-datetime' %}"><i class="fa fa-caret-down"></i></a>
<br>{{ o.invoice_address.name }} <a href="?{% url_replace request 'ordering' 'datetime' %}"><i
{% endif %} class="fa fa-caret-up"></i></a>
</td> </th>
<td>{{ o.datetime|date:"SHORT_DATETIME_FORMAT" }}</td> <th class="text-right">{% trans "Order total" %}
<td class="text-right">{{ o.total|money:request.event.currency }}</td> <a href="?{% url_replace request 'ordering' '-total' %}"><i
<td class="text-right">{{ o.pcnt }}</td> class="fa fa-caret-down"></i></a>
<td class="text-right">{% include "pretixcontrol/orders/fragment_order_status.html" with order=o %}</td> <a href="?{% url_replace request 'ordering' 'total' %}"><i class="fa fa-caret-up"></i></a>
</th>
<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-up"></i></a>
</th>
<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 class="fa fa-caret-up"></i></a>
</th>
</tr> </tr>
{% endfor %} </thead>
</tbody> <tbody>
</table> {% for o in orders %}
</div> <tr>
{% include "pretixcontrol/pagination.html" %} <td>
{% endif %} <strong>
<a
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=o.code %}">
{{ o.code }}
</a>
</strong>
</td>
<td>
{{ o.email|default_if_none:"" }}
{% if o.invoice_address.name %}
<br>{{ o.invoice_address.name }}
{% endif %}
</td>
<td>{{ o.datetime|date:"SHORT_DATETIME_FORMAT" }}</td>
<td class="text-right">{{ o.total|money:request.event.currency }}</td>
<td class="text-right">{{ o.pcnt }}</td>
<td class="text-right">{% include "pretixcontrol/orders/fragment_order_status.html" with order=o %}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
<div class="panel-footer">
{% include "pretixcontrol/pagination.html" %}
</div>
{% endif %}
</div>
{% endblock %} {% endblock %}

View File

@@ -3,31 +3,42 @@
{% load order_overview %} {% load order_overview %}
{% block title %}{% trans "Sales overview" %}{% endblock %} {% block title %}{% trans "Sales overview" %}{% endblock %}
{% block content %} {% block content %}
{% url "control:event.orders" organizer=request.event.organizer.slug event=request.event.slug as listurl %} <div class="panel panel-default panel-with-button">
<div class="pull-right"> <div class="panel-heading">
<div class="btn-group" role="group" id="sumtoggle"> {% url "control:event.orders" organizer=request.event.organizer.slug event=request.event.slug as listurl %}
<button type="button" data-target=".count" class="btn btn-default active">{% trans "Sales" %}</button> <div class="pull-right">
<button type="button" data-target=".sum-gross" class="btn btn-default">{% trans "Revenue (gross)" %}</button> <div class="btn-group" role="group" id="sumtoggle">
<button type="button" data-target=".sum-net" class="btn btn-default">{% trans "Revenue (net)" %}</button> <button type="button" data-target=".count"
class="btn btn-sm btn-default active">{% trans "Sales" %}</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>
<h1 class="panel-title">{% trans "Order overview" %}</h1>
<div class="clearfix"></div>
</div> </div>
</div> {% if request.event.has_subevents %}
<h1>{% trans "Order overview" %}</h1> <form class="panel-body form-inline helper-display-inline" action="" method="get">
{% if request.event.has_subevents %} {% include "pretixcontrol/event/fragment_subevent_choice_simple.html" %}
<form class="form-inline helper-display-inline" action="" method="get"> </form>
{% include "pretixcontrol/event/fragment_subevent_choice_simple.html" %} {% endif %}
</form> {% if subevent_warning %}
{% endif %} <div class="panel-body">
{% if subevent_warning %} <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
If you select a single date, payment method fees will not be listed here as it might not be clear which clear
date they belong to. which
{% endblocktrans %} date they belong to.
</div> {% endblocktrans %}
{% endif %} </div>
<div class="table-responsive"> </div>
<table class="table table-condensed table-hover table-product-overview"> {% endif %}
<thead> <div class="table-responsive">
<table class="table table-condensed table-hover table-product-overview">
<thead>
<tr> <tr>
<th>{% trans "Product" %}</th> <th>{% trans "Product" %}</th>
<th>{% trans "Canceled" %}</th> <th>{% trans "Canceled" %}</th>
@@ -44,8 +55,8 @@
<th>{% trans "Paid" %}</th> <th>{% trans "Paid" %}</th>
<th>{% trans "Total" %}</th> <th>{% trans "Total" %}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for tup in items_by_category %} {% for tup in items_by_category %}
{% if tup.0 %} {% if tup.0 %}
<tr class="category"> <tr class="category">
@@ -105,8 +116,8 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
</tbody> </tbody>
<tfoot> <tfoot>
<tr class="total"> <tr class="total">
<th>{% trans "Total" %}</th> <th>{% trans "Total" %}</th>
<th>{{ total.num_canceled|togglesum:request.event.currency }}</th> <th>{{ total.num_canceled|togglesum:request.event.currency }}</th>
@@ -116,7 +127,8 @@
<th>{{ total.num_paid|togglesum:request.event.currency }}</th> <th>{{ total.num_paid|togglesum:request.event.currency }}</th>
<th>{{ total.num_total|togglesum:request.event.currency }}</th> <th>{{ total.num_total|togglesum:request.event.currency }}</th>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
</div>
</div> </div>
{% endblock %} {% endblock %}

View File

@@ -3,17 +3,25 @@
{% 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">
<form action="" method="post" class="form-horizontal"> <div class="panel-heading">
{% csrf_token %} <h1 class="panel-title">{% trans "Delete entry" %}</h1>
<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">
<a href="{% url "control:event.orders.waitinglist" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
{% trans "Cancel" %}
</a>
<button type="submit" class="btn btn-danger btn-save">
{% trans "Delete" %}
</button>
</div> </div>
</form> <div class="panel-body">
<form action="" method="post" class="form-horizontal">
{% csrf_token %}
<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">
<a href="{% url "control:event.orders.waitinglist" organizer=request.event.organizer.slug event=request.event.slug %}"
class="btn btn-default btn-cancel">
{% trans "Cancel" %}
</a>
<button type="submit" class="btn btn-danger btn-save">
{% trans "Delete" %}
</button>
</div>
</form>
</div>
</div>
{% endblock %} {% endblock %}

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." %}
@@ -14,8 +13,8 @@
<div class="row"> <div class="row">
{% if 'can_change_orders' in request.eventpermset %} {% if 'can_change_orders' in request.eventpermset %}
<form method="post" class="col-md-6" <form method="post" class="col-md-6"
action="{% url "control:event.orders.waitinglist.auto" event=request.event.slug organizer=request.organizer.slug %}" action="{% url "control:event.orders.waitinglist.auto" event=request.event.slug organizer=request.organizer.slug %}"
data-asynctask> data-asynctask>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
{% trans "Send vouchers" %} {% trans "Send vouchers" %}
@@ -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,42 +77,43 @@
</div> </div>
</div> </div>
<p> <div class="panel panel-default">
<form class="form-inline helper-display-inline" action="" method="get"> <div class="panel-heading"><h1 class="panel-title">{% trans "Waiting list" %}</h1></div>
<select name="status" class="form-control"> <div class="panel-body">
<option value="a" <form class="form-inline helper-display-inline" action="" method="get">
{% if request.GET.status == "p" %}selected="selected"{% endif %}>{% trans "All entries" %}</option> <select name="status" class="form-control">
<option value="w" <option value="a"
{% if request.GET.status == "w" or not request.GET.status %}selected="selected"{% endif %}>{% trans "Waiting" %}</option> {% if request.GET.status == "p" %}selected="selected"{% endif %}>{% trans "All entries" %}</option>
<option value="s" <option value="w"
{% if request.GET.status == "s" %}selected="selected"{% endif %}>{% trans "Voucher assigned" %}</option> {% if request.GET.status == "w" or not request.GET.status %}selected="selected"{% endif %}>{% trans "Waiting" %}</option>
</select> <option value="s"
<select name="item" class="form-control"> {% if request.GET.status == "s" %}selected="selected"{% endif %}>{% trans "Voucher assigned" %}</option>
<option value="">{% trans "All products" %}</option> </select>
{% for item in items %} <select name="item" class="form-control">
<option value="{{ item.id }}" <option value="">{% trans "All products" %}</option>
{% if request.GET.item|add:0 == item.id %}selected="selected"{% endif %}> {% for item in items %}
{{ item }} <option value="{{ item.id }}"
</option> {% if request.GET.item|add:0 == item.id %}selected="selected"{% endif %}>
{% endfor %} {{ item }}
</select> </option>
{% if request.event.has_subevents %} {% endfor %}
<select name="subevent" class="form-control"> </select>
<option value="">{% trans "All dates" context "subevent" %}</option> {% if request.event.has_subevents %}
{% for se in request.event.subevents.all %} <select name="subevent" class="form-control">
<option value="{{ se.id }}" <option value="">{% trans "All dates" context "subevent" %}</option>
{% if request.GET.subevent|add:0 == se.id %}selected="selected"{% endif %}> {% for se in request.event.subevents.all %}
{{ se.name }} {{ se.get_date_range_display }} <option value="{{ se.id }}"
</option> {% if request.GET.subevent|add:0 == se.id %}selected="selected"{% endif %}>
{% endfor %} {{ se.name }} {{ se.get_date_range_display }}
</select> </option>
{% endif %} {% endfor %}
<button class="btn btn-primary" type="submit">{% trans "Filter" %}</button> </select>
</form> {% endif %}
</p> <button class="btn btn-primary" type="submit">{% trans "Filter" %}</button>
<form method="post" action=""> </form>
</div>
{% 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>
@@ -142,7 +145,7 @@
<td> <td>
{% if e.voucher %} {% if e.voucher %}
<span class="label label-success">{% trans "Voucher assigned" %}</span> <span class="label label-success">{% trans "Voucher assigned" %}</span>
{% elif e.availability.0 == 100 %} {% elif e.availability.0 == 100 %}
<span class="label label-warning"> <span class="label label-warning">
{% blocktrans with num=e.availability.1 %} {% blocktrans with num=e.availability.1 %}
Waiting, product {{ num }}x available Waiting, product {{ num }}x available
@@ -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>
</form>
<div class="panel-footer">
{% include "pretixcontrol/pagination.html" %}
</div> </div>
</form> </div>
{% include "pretixcontrol/pagination.html" %}
{% endblock %} {% endblock %}

View File

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