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

Report canceled orders as underpaid if necessary

Browse Source
This commit is contained in:
Raphael Michel
2021-08-18 17:35:28 +02:00
parent 1f46a8b91b
commit ead755aa86
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/base/models/orders.py
View File

@@ -419,6 +419,8 @@ class Order(LockModel, LoggedModel):
is_underpaid=Case( is_underpaid=Case(
When(Q(status=Order.STATUS_PAID) & Q(pending_sum_t__gt=1e-8), When(Q(status=Order.STATUS_PAID) & Q(pending_sum_t__gt=1e-8),
then=Value(1)), then=Value(1)),
When(Q(status=Order.STATUS_CANCELED) & Q(pending_sum_rc__gt=1e-8),
then=Value(1)),
default=Value(0), default=Value(0),
output_field=models.IntegerField() output_field=models.IntegerField()
) )

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

@@ -304,8 +304,8 @@ class OrderFilterForm(FilterForm):
elif s == 'underpaid': elif s == 'underpaid':
qs = Order.annotate_overpayments(qs, refunds=False, results=False, sums=True) qs = Order.annotate_overpayments(qs, refunds=False, results=False, sums=True)
qs = qs.filter( qs = qs.filter(
status=Order.STATUS_PAID, Q(status=Order.STATUS_PAID, pending_sum_t__gt=0) |
pending_sum_t__gt=0 Q(status=Order.STATUS_CANCELED, pending_sum_rc__gt=0)
) )
elif s == 'cni': elif s == 'cni':
i = Invoice.objects.filter( i = Invoice.objects.filter(