diff --git a/src/pretix/control/templates/pretixcontrol/order/cancel.html b/src/pretix/control/templates/pretixcontrol/order/cancel.html index 5ab4dc866d..697dad2a93 100644 --- a/src/pretix/control/templates/pretixcontrol/order/cancel.html +++ b/src/pretix/control/templates/pretixcontrol/order/cancel.html @@ -4,35 +4,41 @@ {% trans "Cancel order" %} {% endblock %} {% block content %} -

- {% trans "Cancel order" %} -

-

{% blocktrans trimmed %} - Do you really want to cancel this order? You cannot revert this action. - {% endblocktrans %}

+
+
+

+ {% trans "Cancel order" %} +

+
+
+

{% blocktrans trimmed %} + Do you really want to cancel this order? You cannot revert this action. + {% endblocktrans %}

-
- {% csrf_token %} - -
- + + {% csrf_token %} + +
+ +
+
+
+ + {% trans "No, take me back" %} + +
+
+ +
+
+
+
-
-
- - {% trans "No, take me back" %} - -
-
- -
-
-
- +
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/order/change.html b/src/pretix/control/templates/pretixcontrol/order/change.html index d56968e52d..8b828e6e95 100644 --- a/src/pretix/control/templates/pretixcontrol/order/change.html +++ b/src/pretix/control/templates/pretixcontrol/order/change.html @@ -7,49 +7,60 @@ {% endblocktrans %} {% endblock %} {% block content %} -

- {% blocktrans trimmed with code=order.code %} - Change order: {{ code }} - {% endblocktrans %} - - {% blocktrans trimmed with order=order.code %} - Back to order {{ order }} - {% endblocktrans %} - -

-

- {% blocktrans trimmed %} - 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 - additional questions can be added to the order that need to be answered by the user. - {% endblocktrans %} -

-

- {% blocktrans trimmed %} - 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. - {% endblocktrans %} -

-

- {% blocktrans trimmed %} - If an invoice is attached to the order, a cancellation will be created together with a new invoice. - {% endblocktrans %} -

-

- {% blocktrans trimmed %} - If you chose "split into new order" for multiple positions, they will be all split in one second order - together, not multiple orders. - {% endblocktrans %} -

-
- {% 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 %} -
+
+
+ + {% blocktrans trimmed with order=order.code %} + Back to order {{ order }} + {% endblocktrans %} + +

+ {% blocktrans trimmed with code=order.code %} + Change order: {{ code }} + {% endblocktrans %} +

+
+
+

+ {% blocktrans trimmed %} + 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 + additional questions can be added to the order that need to be answered by the user. + {% endblocktrans %} +

+

+ {% blocktrans trimmed %} + 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. + {% endblocktrans %} +

+

+ {% blocktrans trimmed %} + If an invoice is attached to the order, a cancellation will be created together with a new invoice. + {% endblocktrans %} +

+

+ {% blocktrans trimmed %} + If you chose "split into new order" for multiple positions, they will be all split in one second + order + together, not multiple orders. + {% endblocktrans %} +

+
+ {% 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 %} +
+
+
{% csrf_token %} {% for position in positions %} @@ -63,10 +74,10 @@ {% endif %} {% if position.addon_to %} – - {% blocktrans trimmed with posid=position.addon_to.positionid %} - Add-On to position #{{ posid }} - {% endblocktrans %} - + {% blocktrans trimmed with posid=position.addon_to.positionid %} + Add-On to position #{{ posid }} + {% endblocktrans %} + {% endif %}
@@ -84,14 +95,14 @@
@@ -100,7 +111,7 @@
@@ -109,7 +120,7 @@
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/order/change_locale.html b/src/pretix/control/templates/pretixcontrol/order/change_locale.html index 7a8de2840b..f5dcd79280 100644 --- a/src/pretix/control/templates/pretixcontrol/order/change_locale.html +++ b/src/pretix/control/templates/pretixcontrol/order/change_locale.html @@ -5,34 +5,40 @@ {% trans "Change locale information" %} {% endblock %} {% block content %} -

- {% trans "Change locale information" %} - - {% blocktrans trimmed with order=order.code %} - Back to order {{ order }} - {% endblocktrans %} - -

-

- {% blocktrans trimmed %} - This language will be used whenever emails are sent to the users. - {% endblocktrans %} -

- -
- {% csrf_token %} - - {% bootstrap_form form layout='horizontal' %} -
- - {% trans "Cancel" %} +
+
+ + {% blocktrans trimmed with order=order.code %} + Back to order {{ order }} + {% endblocktrans %} - -
+

+ {% trans "Change locale information" %} +

- +
+

+ {% blocktrans trimmed %} + This language will be used whenever emails are sent to the users. + {% endblocktrans %} +

+ +
+ {% csrf_token %} + + {% bootstrap_form form layout='horizontal' %} +
+ + {% trans "Cancel" %} + + +
+
+
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/order/change_questions.html b/src/pretix/control/templates/pretixcontrol/order/change_questions.html index 2a3c696e5c..371e9c601b 100644 --- a/src/pretix/control/templates/pretixcontrol/order/change_questions.html +++ b/src/pretix/control/templates/pretixcontrol/order/change_questions.html @@ -5,26 +5,31 @@ {% trans "Change contact information" %} {% endblock %} {% block content %} -

- {% trans "Change order information" %} - - {% blocktrans trimmed with order=order.code %} - Back to order {{ order }} - {% endblocktrans %} - -

+
+
+ + {% blocktrans trimmed with order=order.code %} + Back to order {{ order }} + {% endblocktrans %} + +

+ {% trans "Change order information" %} +

+
+
{% csrf_token %} -
+
{% if request.event.settings.invoice_address_asked or order.invoice_address or request.event.settings.invoice_name_required %}

- {% trans "Invoice information" %} {% if not request.event.settings.invoice_address_required %} - {% trans "(optional)" %} - {% endif %} + {% trans "Invoice information" %} + {% if not request.event.settings.invoice_address_required %} + {% trans "(optional)" %} + {% endif %}

@@ -61,7 +66,7 @@
+ href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}"> {% trans "Cancel" %} -
+

+ {% trans "Extend payment term" %} +

- +
+
+ {% csrf_token %} + + {% bootstrap_form form layout='horizontal' %} +
+ + {% trans "Cancel" %} + + +
+
+
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/order/mail_history.html b/src/pretix/control/templates/pretixcontrol/order/mail_history.html index d84233a0f0..f08a87534e 100644 --- a/src/pretix/control/templates/pretixcontrol/order/mail_history.html +++ b/src/pretix/control/templates/pretixcontrol/order/mail_history.html @@ -3,16 +3,18 @@ {% load bootstrap3 %} {% block title %}{% trans "Email history" %}{% endblock %} {% block content %} -

- {% trans "Email history" %} - - {% blocktrans trimmed with order=order.code %} - Back to order {{ order }} - {% endblocktrans %} - -

-
+
+
+ + {% blocktrans trimmed with order=order.code %} + Back to order {{ order }} + {% endblocktrans %} + +

+ {% trans "Email history" %} +

+
    {% for log in logs %}
  • @@ -55,6 +57,8 @@
    • {% endfor %}
+
+ {% include "pretixcontrol/pagination.html" %} +
- {% include "pretixcontrol/pagination.html" %} {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/order/pay.html b/src/pretix/control/templates/pretixcontrol/order/pay.html index b22424c634..af38bdb059 100644 --- a/src/pretix/control/templates/pretixcontrol/order/pay.html +++ b/src/pretix/control/templates/pretixcontrol/order/pay.html @@ -5,32 +5,38 @@ {% trans "Mark order as paid" %} {% endblock %} {% block content %} -

- {% trans "Mark order as paid" %} - - {% blocktrans trimmed with order=order.code %} - Back to order {{ order }} - {% endblocktrans %} - -

- -
- {% csrf_token %} -

{% blocktrans trimmed %} - Do you really want to mark this order as paid? - {% endblocktrans %}

- - {% bootstrap_form form layout='horizontal' horizontal_label_class='sr-only' horizontal_field_class='col-md-12' %} -
- - {% trans "Cancel" %} +
+
+ + {% blocktrans trimmed with order=order.code %} + Back to order {{ order }} + {% endblocktrans %} - -
+

+ {% trans "Mark order as paid" %} +

- +
+ +
+ {% csrf_token %} +

{% blocktrans trimmed %} + Do you really want to mark this order as paid? + {% endblocktrans %}

+ + {% bootstrap_form form layout='horizontal' horizontal_label_class='sr-only' horizontal_field_class='col-md-12' %} +
+ + {% trans "Cancel" %} + + +
+
+
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/order/refund.html b/src/pretix/control/templates/pretixcontrol/order/refund.html index 0b1fc6302e..facb81896b 100644 --- a/src/pretix/control/templates/pretixcontrol/order/refund.html +++ b/src/pretix/control/templates/pretixcontrol/order/refund.html @@ -4,37 +4,43 @@ {% trans "Refund order" %} {% endblock %} {% block content %} -

- {% trans "Refund order" %} - - {% blocktrans trimmed with order=order.code %} - Back to order {{ order }} - {% endblocktrans %} - -

-
-

{% blocktrans trimmed %} - Do you really want to refund this order? You cannot revert this action. - {% endblocktrans %}

- - {{ payment|safe }} - - {% csrf_token %} - -
-
- - {% trans "No, take me back" %} - -
-
- -
-
+
+
+ + {% blocktrans trimmed with order=order.code %} + Back to order {{ order }} + {% endblocktrans %} + +

+ {% trans "Refund order" %} +

- +
+
+

{% blocktrans trimmed %} + Do you really want to refund this order? You cannot revert this action. + {% endblocktrans %}

+ + {{ payment|safe }} + + {% csrf_token %} + +
+
+ + {% trans "No, take me back" %} + +
+
+ +
+
+
+
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/order/sendmail.html b/src/pretix/control/templates/pretixcontrol/order/sendmail.html index 06d33a0d52..ef6ac7a8c5 100644 --- a/src/pretix/control/templates/pretixcontrol/order/sendmail.html +++ b/src/pretix/control/templates/pretixcontrol/order/sendmail.html @@ -3,43 +3,51 @@ {% load bootstrap3 %} {% block title %}{% trans "Send email" %}{% endblock %} {% block content %} -

- {% trans "Send email" %} - - {% blocktrans trimmed with order=order.code %} - Back to order {{ order }} - {% endblocktrans %} - -

- {% block inner %} -
- {% csrf_token %} - {% bootstrap_field form.sendto layout='horizontal' %} - {% bootstrap_field form.subject layout='horizontal' %} - {% bootstrap_field form.message layout='horizontal' %} - {% if request.method == "POST" %} -
- {% trans "E-mail preview" %} -
- 
-                            {% for segment in preview_output %}
-                                {% spaceless %}
-                                    {{ segment|linebreaksbr }}
-                                {% endspaceless %}
-                            {% endfor %}
-
-
-
- {% endif %} -
- - +
+
+ + {% blocktrans trimmed with order=order.code %} + Back to order {{ order }} + {% endblocktrans %} + +

+ {% trans "Send email" %} +

+
+
+ + {% csrf_token %} + {% bootstrap_field form.sendto layout='horizontal' %} + {% bootstrap_field form.subject layout='horizontal' %} + {% bootstrap_field form.message layout='horizontal' %} +
+ + +
+ +
+
+ {% if request.method == "POST" %} +
+
+ {% trans "E-mail preview" %}
- - {% endblock %} +
+
+ 
+                    {% for segment in preview_output %}
+                        {% spaceless %}
+                            {{ segment|linebreaksbr }}
+                        {% endspaceless %}
+                    {% endfor %}
+
+
+
+
+ {% endif %} {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/orders/export.html b/src/pretix/control/templates/pretixcontrol/orders/export.html index c019988f7a..9225db728e 100644 --- a/src/pretix/control/templates/pretixcontrol/orders/export.html +++ b/src/pretix/control/templates/pretixcontrol/orders/export.html @@ -4,12 +4,11 @@ {% load order_overview %} {% block title %}{% trans "Data export" %}{% endblock %} {% block content %} -

- {% trans "Data export" %} - {% if "identifier" in request.GET %} + {% if "identifier" in request.GET %} +

{% trans "Show all" %} - {% endif %} -

+

+ {% endif %} {% for e in exporters %}
@@ -21,10 +20,10 @@
+ method="post" class="form-horizontal" data-asynctask data-asynctask-download + data-asynctask-long> {% csrf_token %} - + {% bootstrap_form e.form layout='horizontal' %} -
- -
-
- {% bootstrap_field filter_form.status layout='inline' %} -
- {% if request.event.has_subevents %} -
- {% bootstrap_field filter_form.item layout='inline' %} -
-
- {% bootstrap_field filter_form.subevent layout='inline' %} -
-
- {% bootstrap_field filter_form.provider layout='inline' %} -
- {% else %} -
- {% bootstrap_field filter_form.item layout='inline' %} -
-
- {% bootstrap_field filter_form.provider layout='inline' %} -
- {% endif %} -
- {% bootstrap_field filter_form.query layout='inline' %} -
-
-
+
+
+
+ {% bootstrap_field filter_form.status layout='inline' %} +
+ {% if request.event.has_subevents %} +
+ {% bootstrap_field filter_form.item layout='inline' %} +
+
+ {% bootstrap_field filter_form.subevent layout='inline' %} +
+
+ {% bootstrap_field filter_form.provider layout='inline' %} +
+ {% else %} +
+ {% bootstrap_field filter_form.item layout='inline' %} +
+
+ {% bootstrap_field filter_form.provider layout='inline' %} +
+ {% endif %} +
+ {% bootstrap_field filter_form.query layout='inline' %} +
+
+ + +
+
- -
- {% if filter_form.is_valid and filter_form.cleaned_data.question %} -

- - {% blocktrans trimmed with question=filter_form.cleaned_data.question.question %} - List filtered by answers to question "{{ question }}". - {% endblocktrans %} - - - {% trans "Remove filter" %} - -

- {% endif %} -
- - - - - - - - - - - - - {% for o in orders %} + {% if filter_form.is_valid and filter_form.cleaned_data.question %} +

+ + {% blocktrans trimmed with question=filter_form.cleaned_data.question.question %} + List filtered by answers to question "{{ question }}". + {% endblocktrans %} + + + {% trans "Remove filter" %} + +

+ {% endif %} + +
+
{% trans "Order code" %} - - {% trans "User" %} - - {% trans "Order date" %} - - - {% trans "Order total" %} - - {% trans "Positions" %} - - {% trans "Status" %} - -
+ - - - - - - + + + + + + - {% endfor %} - -
- - - {{ o.code }} - - - - {{ o.email|default_if_none:"" }} - {% if o.invoice_address.name %} -
{{ o.invoice_address.name }} - {% endif %} - 		{{ o.datetime|date:"SHORT_DATETIME_FORMAT" }}{{ o.total|money:request.event.currency }}{{ o.pcnt }}{% include "pretixcontrol/orders/fragment_order_status.html" with order=o %}{% trans "Order code" %} + + + {% trans "User" %} + + + {% trans "Order date" %} + + + {% trans "Order total" %} + + + {% trans "Positions" %} + + + {% trans "Status" %} + + +
-
- {% include "pretixcontrol/pagination.html" %} - {% endif %} + + + {% for o in orders %} + + + + + {{ o.code }} + + + + + {{ o.email|default_if_none:"" }} + {% if o.invoice_address.name %} +
{{ o.invoice_address.name }} + {% endif %} + + {{ o.datetime|date:"SHORT_DATETIME_FORMAT" }} + {{ o.total|money:request.event.currency }} + {{ o.pcnt }} + {% include "pretixcontrol/orders/fragment_order_status.html" with order=o %} + + {% endfor %} + + +
+
+ {% include "pretixcontrol/pagination.html" %} +
+ {% endif %} +
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/orders/overview.html b/src/pretix/control/templates/pretixcontrol/orders/overview.html index f472390904..df4a232df7 100644 --- a/src/pretix/control/templates/pretixcontrol/orders/overview.html +++ b/src/pretix/control/templates/pretixcontrol/orders/overview.html @@ -3,31 +3,42 @@ {% load order_overview %} {% block title %}{% trans "Sales overview" %}{% endblock %} {% block content %} - {% 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 %} +
+
+ + + +
+
+

{% trans "Order overview" %}

+
-
-

{% trans "Order overview" %}

- {% if request.event.has_subevents %} -
- {% include "pretixcontrol/event/fragment_subevent_choice_simple.html" %} -
- {% endif %} - {% if subevent_warning %} -
- {% 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 - date they belong to. - {% endblocktrans %} -
- {% endif %} -
- - + {% if request.event.has_subevents %} + + {% include "pretixcontrol/event/fragment_subevent_choice_simple.html" %} + + {% endif %} + {% if subevent_warning %} +
+
+ {% 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 + date they belong to. + {% endblocktrans %} +
+
+ {% endif %} +
+
+ @@ -44,8 +55,8 @@ - - + + {% for tup in items_by_category %} {% if tup.0 %} @@ -105,8 +116,8 @@ {% endif %} {% endfor %} {% endfor %} - - + + @@ -116,7 +127,8 @@ - -
{% trans "Product" %} {% trans "Canceled" %}{% trans "Paid" %} {% trans "Total" %}
{% trans "Total" %} {{ total.num_canceled|togglesum:request.event.currency }}{{ total.num_paid|togglesum:request.event.currency }} {{ total.num_total|togglesum:request.event.currency }}
+ + +
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/waitinglist/delete.html b/src/pretix/control/templates/pretixcontrol/waitinglist/delete.html index d119d88cc0..fe879416b7 100644 --- a/src/pretix/control/templates/pretixcontrol/waitinglist/delete.html +++ b/src/pretix/control/templates/pretixcontrol/waitinglist/delete.html @@ -3,17 +3,25 @@ {% load bootstrap3 %} {% block title %}{% trans "Delete entry" %}{% endblock %} {% block content %} -

{% trans "Delete entry" %}

-
- {% csrf_token %} -

{% blocktrans %}Are you sure you want to delete the following waiting list entry {{ entry }}?{% endblocktrans %}

-
- - {% trans "Cancel" %} - - +
+
+

{% trans "Delete entry" %}

- +
+
+ {% csrf_token %} +

{% blocktrans %}Are you sure you want to delete the following waiting list entry + {{ entry }}?{% endblocktrans %}

+
+ + {% trans "Cancel" %} + + +
+
+
+
{% endblock %} \ No newline at end of file diff --git a/src/pretix/control/templates/pretixcontrol/waitinglist/index.html b/src/pretix/control/templates/pretixcontrol/waitinglist/index.html index 0bcb1bafe0..35e28a3c89 100644 --- a/src/pretix/control/templates/pretixcontrol/waitinglist/index.html +++ b/src/pretix/control/templates/pretixcontrol/waitinglist/index.html @@ -5,7 +5,6 @@ {% load urlreplace %} {% block title %}{% trans "Waiting list" %}{% endblock %} {% block content %} -

{% trans "Waiting list" %}

{% if not request.event.settings.waiting_list_enabled %}
{% 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 @@
{% if 'can_change_orders' in request.eventpermset %}
+ action="{% url "control:event.orders.waitinglist.auto" event=request.event.slug organizer=request.organizer.slug %}" + data-asynctask>
{% trans "Send vouchers" %} @@ -25,9 +24,12 @@ {% if request.event.settings.waiting_list_auto %}

{% blocktrans trimmed %} - You have configured that vouchers will automatically be sent to the persons on this list who waited - 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 + You have configured that vouchers will automatically be sent to the persons on this + list who waited + 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. {% endblocktrans %}

@@ -75,42 +77,43 @@
-

- - - - {% if request.event.has_subevents %} - - {% endif %} - -

-

-
+
+

{% trans "Waiting list" %}

+
+ + + + {% if request.event.has_subevents %} + + {% endif %} + + +
{% csrf_token %} -
+
@@ -142,7 +145,7 @@
{% if e.voucher %} {% trans "Voucher assigned" %} - {% elif e.availability.0 == 100 %} + {% elif e.availability.0 == 100 %} {% blocktrans with num=e.availability.1 %} Waiting, product {{ num }}x available @@ -165,7 +168,8 @@ {% if not e.voucher %} - + {% else %} {% endif %} @@ -176,7 +180,9 @@ {% endfor %}
+
+
+ {% include "pretixcontrol/pagination.html" %}
- - {% include "pretixcontrol/pagination.html" %} +
{% endblock %} diff --git a/src/pretix/static/pretixcontrol/scss/_orders.scss b/src/pretix/static/pretixcontrol/scss/_orders.scss index 5ff10167fb..0297b67e48 100644 --- a/src/pretix/static/pretixcontrol/scss/_orders.scss +++ b/src/pretix/static/pretixcontrol/scss/_orders.scss @@ -20,10 +20,6 @@ } } -#sumtoggle { - margin-top: 20px; -} - .logentry { .meta { font-size: 12px;