Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adds invoice status to nag_unpaid

Browse source
This commit is contained in:
Christopher Neugebauer 2017-01-08 09:48:48 +11:00
parent 3b985d40ac
commit de902a213d
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
registrasion/forms.py
View file

@ -442,6 +442,7 @@ class InvoiceEmailForm(forms.Form):
def __init__(self, *a, **k): def __init__(self, *a, **k):
category = k.pop('category', None) or [] category = k.pop('category', None) or []
product = k.pop('product', None) or [] product = k.pop('product', None) or []
status = int(k.pop('status', None) or 0)
category = [int(i) for i in category] category = [int(i) for i in category]
product = [int(i) for i in product] product = [int(i) for i in product]
@ -449,7 +450,7 @@ class InvoiceEmailForm(forms.Form):
super(InvoiceEmailForm, self).__init__(*a, **k) super(InvoiceEmailForm, self).__init__(*a, **k)
qs = commerce.Invoice.objects.filter( qs = commerce.Invoice.objects.filter(
status=commerce.Invoice.STATUS_UNPAID, status=status or commerce.Invoice.STATUS_UNPAID,
).filter( ).filter(
Q(lineitem__product__category__in=category) | Q(lineitem__product__category__in=category) |
Q(lineitem__product__in=product) Q(lineitem__product__in=product)

2
registrasion/views.py
View file

@ -931,11 +931,13 @@ def nag_unpaid(request):
category = request.GET.getlist("category", []) category = request.GET.getlist("category", [])
product = request.GET.getlist("product", []) product = request.GET.getlist("product", [])
status = request.GET.get("status")
form = forms.InvoiceEmailForm( form = forms.InvoiceEmailForm(
request.POST or None, request.POST or None,
category=category, category=category,
product=product, product=product,
status=status,
) )
emails = [] emails = []