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

Fix #491 -- Search order by invoice number

Browse Source
This commit is contained in:
Raphael Michel
2017-07-18 11:14:51 +02:00
parent 2ad9e1bb43
commit 83df4451e6
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/control/forms/filter.py
View File

@@ -1,5 +1,6 @@
from django import forms from django import forms
from django.db.models import Q from django.db.models import Q
from django.db.models.functions import Concat
from django.utils.timezone import now from django.utils.timezone import now
from django.utils.translation import pgettext_lazy, ugettext_lazy as _ from django.utils.translation import pgettext_lazy, ugettext_lazy as _
@@ -46,11 +47,13 @@ class OrderFilterForm(FilterForm):
if fdata.get('query'): if fdata.get('query'):
u = fdata.get('query') u = fdata.get('query')
if "-" in u: if "-" in u:
code = (Q(event__slug__icontains=u.split("-")[0]) code = (Q(event__slug__icontains=u.split("-")[0])
& Q(code__icontains=Order.normalize_code(u.split("-")[1]))) & Q(code__icontains=Order.normalize_code(u.split("-")[1])))
else: else:
code = Q(code__icontains=Order.normalize_code(u)) code = Q(code__icontains=Order.normalize_code(u))
qs = qs.annotate(inr=Concat('invoices__prefix', 'invoices__invoice_no'))
qs = qs.filter( qs = qs.filter(
code code
| Q(email__icontains=u) | Q(email__icontains=u)
@@ -58,6 +61,9 @@ class OrderFilterForm(FilterForm):
| Q(positions__attendee_email__icontains=u) | Q(positions__attendee_email__icontains=u)
| Q(invoice_address__name__icontains=u) | Q(invoice_address__name__icontains=u)
| Q(invoice_address__company__icontains=u) | Q(invoice_address__company__icontains=u)
| Q(invoices__invoice_no=u)
| Q(invoices__invoice_no=u.zfill(5))
| Q(inr=u)
) )
if fdata.get('status'): if fdata.get('status'):

28
src/pretix/plugins/banktransfer/views.py
View File

@@ -5,7 +5,8 @@ from datetime import timedelta
from django.contrib import messages from django.contrib import messages
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.db.models import Q from django.db.models import Count, Q
from django.db.models.functions import Concat
from django.http import JsonResponse from django.http import JsonResponse
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
from django.utils.functional import cached_property from django.utils.functional import cached_property
@@ -145,11 +146,30 @@ class ActionView(View):
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
from django.utils.formats import localize from django.utils.formats import localize
query = request.GET.get('query', '') u = request.GET.get('query', '')
if len(query) < 2: if len(u) < 2:
return JsonResponse({'results': []}) return JsonResponse({'results': []})
qs = self.order_qs().filter(Q(code__icontains=query) | Q(code__icontains=Order.normalize_code(query))).select_related('event') if "-" in u:
code = (Q(event__slug__icontains=u.split("-")[0])
& Q(code__icontains=Order.normalize_code(u.split("-")[1])))
else:
code = Q(code__icontains=Order.normalize_code(u))
qs = self.order_qs().order_by('pk').annotate(inr=Concat('invoices__prefix', 'invoices__invoice_no')).filter(
code
| Q(email__icontains=u)
| Q(positions__attendee_name__icontains=u)
| Q(positions__attendee_email__icontains=u)
| Q(invoice_address__name__icontains=u)
| Q(invoice_address__company__icontains=u)
| Q(invoices__invoice_no=u)
| Q(invoices__invoice_no=u.zfill(5))
| Q(inr=u)
).select_related('event').annotate(pcnt=Count('invoices')).distinct()
# Yep, we wouldn't need to count the invoices here. However, having this Count() statement in there
# tricks Django into generating a GROUP BY clause that it otherwise wouldn't and that is required to
# avoid duplicate results. Yay?
return JsonResponse({ return JsonResponse({
'results': [ 'results': [
{ {