CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix overpaid queries

Browse Source
This commit is contained in:
Raphael Michel
2018-08-06 16:16:19 +02:00
parent dd46767ee3
commit f4be90fdd0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,9 +273,9 @@ class EventOrderFilterForm(OrderFilterForm):
if fdata.get('status') == 'overpaid': if fdata.get('status') == 'overpaid':
qs = qs.filter( qs = qs.filter(
Q(~Q(status__in=[Order.STATUS_REFUNDED, Order.STATUS_CANCELED]) & Q(pending_sum_t__lt=0)) Q(~Q(status__in=(Order.STATUS_REFUNDED, Order.STATUS_CANCELED)) & Q(pending_sum_t__lt=0))
| Q(Q(status__in=[Order.STATUS_REFUNDED, Order.STATUS_CANCELED]) & Q(pending_sum_rc__lt=0)) | Q(Q(status__in=(Order.STATUS_REFUNDED, Order.STATUS_CANCELED)) & Q(pending_sum_rc__lt=0))
| Q(Q(status__in=[Order.STATUS_EXPIRED, Order.STATUS_PENDING]) & Q(pending_sum_rc__lte=0)) | Q(Q(status__in=(Order.STATUS_EXPIRED, Order.STATUS_PENDING)) & Q(pending_sum_t__lte=0))
) )
elif fdata.get('status') == 'underpaid': elif fdata.get('status') == 'underpaid':
qs = qs.filter( qs = qs.filter(

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

@@ -267,9 +267,9 @@ def event_index(request, organizer, event):
} }
ctx['has_overpaid_orders'] = Order.annotate_overpayments(request.event.orders).filter( ctx['has_overpaid_orders'] = Order.annotate_overpayments(request.event.orders).filter(
Q(~Q(status__in=[Order.STATUS_REFUNDED, Order.STATUS_CANCELED]) & Q(pending_sum_t__lt=0)) Q(~Q(status__in=(Order.STATUS_REFUNDED, Order.STATUS_CANCELED)) & Q(pending_sum_t__lt=0))
| Q(Q(status__in=[Order.STATUS_REFUNDED, Order.STATUS_CANCELED]) & Q(pending_sum_rc__lt=0)) | Q(Q(status__in=(Order.STATUS_REFUNDED, Order.STATUS_CANCELED)) & Q(pending_sum_rc__lt=0))
| Q(Q(status__in=[Order.STATUS_EXPIRED, Order.STATUS_PENDING]) & Q(pending_sum_rc__lte=0)) | Q(Q(status__in=(Order.STATUS_EXPIRED, Order.STATUS_PENDING)) & Q(pending_sum_t__lte=0))
).exists() ).exists()
ctx['has_pending_refunds'] = OrderRefund.objects.filter( ctx['has_pending_refunds'] = OrderRefund.objects.filter(
order__event=request.event, order__event=request.event,