CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-06 15:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Invoice name in order list

Browse Source
This commit is contained in:
Raphael Michel
2017-06-28 17:37:53 +02:00
parent 8ea9d5685d
commit ecc788fd79
4 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/control/views/orders.py
View File

@@ -3,6 +3,7 @@ from datetime import timedelta
from django.conf import settings
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.db.models import Count
from django.http import FileResponse, Http404, HttpResponseNotAllowed
from django.shortcuts import redirect, render
from django.utils.functional import cached_property
@@ -49,13 +50,14 @@ class OrderList(EventPermissionRequiredMixin, ListView):
def get_queryset(self):
qs = Order.objects.filter(
event=self.request.event
)
).annotate(pcnt=Count('positions')).select_related('invoice_address')
if self.filter_form.is_valid():
qs = self.filter_form.filter_qs(qs)
if self.request.GET.get("ordering", "") != "":
p = self.request.GET.get("ordering", "")
p_admissable = ('-code', 'code', '-email', 'email', '-total', 'total', '-datetime', 'datetime', '-status', 'status')
p_admissable = ('-code', 'code', '-email', 'email', '-total', 'total', '-datetime', 'datetime',
'-status', 'status', 'pcnt', '-pcnt')
if p in p_admissable:
qs = qs.order_by(p)

6
src/pretix/control/views/search.py
View File

@@ -1,4 +1,4 @@
from django.db.models import Q
from django.db.models import Count, Q
from django.utils.functional import cached_property
from django.views.generic import ListView
@@ -22,7 +22,7 @@ class OrderSearch(ListView):
return ctx
def get_queryset(self):
qs = Order.objects.all()
qs = Order.objects.all().annotate(pcnt=Count('positions')).select_related('invoice_address')
if not self.request.user.is_superuser:
qs = qs.filter(
Q(event__organizer_id__in=self.request.user.teams.filter(
@@ -37,7 +37,7 @@ class OrderSearch(ListView):
if self.request.GET.get("ordering", "") != "":
p = self.request.GET.get("ordering", "")
p_admissable = ('event', '-event', '-code', 'code', '-email', 'email', '-total', 'total', '-datetime',
'datetime', '-status', 'status')
'datetime', '-status', 'status', 'pcnt', '-pcnt')
if p in p_admissable:
qs = qs.order_by(p)