Treat partially paid expired orders as overpaid orders (Z#23147757) (#3990)

* Treat partially paid expired orders as overpaid orders (Z#23147757)

* Use is_overpaid from annotate_overpayments in OrderFilterForm

* Revert change to pending sum

* Show warning on order page

---------

Co-authored-by: Mira Weller <weller@rami.io>
This commit is contained in:
Raphael Michel
2024-03-22 10:17:51 +01:00
committed by GitHub
co-authored by Mira Weller
parent e4e0bd7ca0
commit 2d8fba7d7c
3 changed files with 12 additions and 8 deletions
+2 -5
View File
@@ -309,11 +309,8 @@ class OrderFilterForm(FilterForm):
elif s in ('p', 'n', 'e', 'c', 'r'):
qs = qs.filter(status=s)
elif s == 'overpaid':
qs = Order.annotate_overpayments(qs, refunds=False, results=False, sums=True)
qs = qs.filter(
Q(~Q(status=Order.STATUS_CANCELED) & Q(pending_sum_t__lt=0))
| Q(Q(status=Order.STATUS_CANCELED) & Q(pending_sum_rc__lt=0))
)
qs = Order.annotate_overpayments(qs, refunds=False, results=True, sums=False)
qs = qs.filter(is_overpaid=True)
elif s == 'rc':
qs = qs.filter(
cancellation_requests__isnull=False