Show ticket code in check-in list

This commit is contained in:
Raphael Michel
2019-03-08 12:50:25 +01:00
parent 12fc02b2e4
commit 7be5331da5
3 changed files with 39 additions and 2 deletions

View File

@@ -70,6 +70,7 @@
<a href="?{% url_replace request 'ordering' 'email'%}"><i class="fa fa-caret-up"></i></a></th>
<th>{% trans "Name" %} <a href="?{% url_replace request 'ordering' '-name'%}"><i class="fa fa-caret-down"></i></a>
<a href="?{% url_replace request 'ordering' 'name'%}"><i class="fa fa-caret-up"></i></a></th>
<th>{% trans "Ticket code" %}</th>
<th>{% 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>
<th>{% trans "Timestamp" %} <a href="?{% url_replace request 'ordering' '-timestamp'%}"><i class="fa fa-caret-down"></i></a>
@@ -102,6 +103,9 @@
{{ e.attendee_name }}
{% endif %}
</td>
<td>
{{ e.secret|slice:":10" }}…
</td>
<td>
{% if not e.last_checked_in %}
<span class="label label-danger">{% trans "Not checked in" %}</span>

View File

@@ -85,7 +85,7 @@
</p>
{% endif %}
<div class="table-responsive">
<table class="table table-condensed table-hover">
<table class="table table-condensed table-hover table-orders">
<thead>
<tr>
<th>{% trans "Order code" %}
@@ -147,6 +147,30 @@
</tr>
{% endfor %}
</tbody>
{% if sums %}
<tfoot>
<tr>
<th>{% trans "Sum over all pages" %}</th>
<th></th>
<th>
{% blocktrans trimmed count s=sums.c %}
1 order
{% plural %}
{{ s }} orders
{% endblocktrans %}
</th>
<th class="text-right">
{{ sums.s|money:request.event.currency }}
</th>
<th class="text-right">
{% if sums.pc %}
{{ sums.pc }}
{% endif %}
</th>
<th></th>
</tr>
</tfoot>
{% endif %}
</table>
</div>
{% include "pretixcontrol/pagination.html" %}

View File

@@ -13,7 +13,7 @@ from django.core.files import File
from django.db import transaction
from django.db.models import (
Count, IntegerField, OuterRef, ProtectedError, Q, Subquery,
)
Sum)
from django.http import (
FileResponse, Http404, HttpResponseNotAllowed, JsonResponse,
)
@@ -126,6 +126,15 @@ class OrderList(EventPermissionRequiredMixin, PaginationMixin, ListView):
o.has_external_refund = annotated.get(o.pk)['has_external_refund']
o.has_pending_refund = annotated.get(o.pk)['has_pending_refund']
if ctx['page_obj'].paginator.count < 1000:
# Performance safeguard: Only count positions if the data set is small
ctx['sums'] = self.get_queryset().annotate(
pcnt=Subquery(s, output_field=IntegerField())
).aggregate(
s=Sum('total'), pc=Sum('pcnt'), c=Count('id')
)
else:
ctx['sums'] = self.get_queryset().aggregate(s=Sum('total'), c=Count('id'))
return ctx
@cached_property