From 274187b8bf7e630ae752801173cc0535ab4bf16a Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Sun, 8 Jan 2017 09:52:49 +1100
Subject: [PATCH] =?UTF-8?q?Renames=20=E2=80=9Cnag=5Funpaid=E2=80=9D=20to?=
 =?UTF-8?q?=20=E2=80=9Cinvoice=5Fmailout=E2=80=9D,=20better=20matches=20cu?=
 =?UTF-8?q?rrent=20intent.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 registrasion/forms.py           | 1 +
 registrasion/reporting/views.py | 9 +++++----
 registrasion/urls.py            | 4 ++--
 registrasion/views.py           | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/registrasion/forms.py b/registrasion/forms.py
index 837c8e9f..25a54768 100644
--- a/registrasion/forms.py
+++ b/registrasion/forms.py
@@ -448,6 +448,7 @@ class InvoiceEmailForm(forms.Form):
         product = [int(i) for i in product]
 
         super(InvoiceEmailForm, self).__init__(*a, **k)
+        print status
 
         qs = commerce.Invoice.objects.filter(
             status=status or commerce.Invoice.STATUS_UNPAID,
diff --git a/registrasion/reporting/views.py b/registrasion/reporting/views.py
index a350cb3d..eac9fd80 100644
--- a/registrasion/reporting/views.py
+++ b/registrasion/reporting/views.py
@@ -593,10 +593,11 @@ def attendee_data(request, form, user_id=None):
 
     # Add invoice nag link
     links = []
-    links.append((
-        reverse(views.nag_unpaid, args=[]) + "?" + request.META["QUERY_STRING"],
-        "Send invoice reminders",
-    ))
+    invoice_mailout = reverse(views.invoice_mailout, args=[]) + "?" + request.META["QUERY_STRING"]
+    links += [
+        (invoice_mailout + "&status=1", "Send invoice reminders",),
+        (invoice_mailout + "&status=2", "Send mail for paid invoices",),
+    ]
 
     if items.count() > 0:
         output.append(Links("Actions", links))
diff --git a/registrasion/urls.py b/registrasion/urls.py
index 2028d86b..8f2e1663 100644
--- a/registrasion/urls.py
+++ b/registrasion/urls.py
@@ -12,8 +12,8 @@ from .views import (
     guided_registration,
     invoice,
     invoice_access,
+    invoice_mailout,
     manual_payment,
-    nag_unpaid,
     product_category,
     refund,
     review,
@@ -35,7 +35,7 @@ public = [
         refund, name="refund"),
     url(r"^invoice_access/([A-Z0-9]+)$", invoice_access,
         name="invoice_access"),
-    url(r"^nag_unpaid$", nag_unpaid, name="nag_unpaid"),
+    url(r"^invoice_mailout$", invoice_mailout, name="invoice_mailout"),
     url(r"^profile$", edit_profile, name="attendee_edit"),
     url(r"^register$", guided_registration, name="guided_registration"),
     url(r"^review$", review, name="review"),
diff --git a/registrasion/views.py b/registrasion/views.py
index 815aa2e3..f4a59eb0 100644
--- a/registrasion/views.py
+++ b/registrasion/views.py
@@ -926,8 +926,8 @@ Email = namedtuple(
 )
 
 @user_passes_test(_staff_only)
-def nag_unpaid(request):
-    ''' Allows staff to nag users with unpaid invoices. '''
+def invoice_mailout(request):
+    ''' Allows staff to send emails to users based on their invoice status. '''
 
     category = request.GET.getlist("category", [])
     product  = request.GET.getlist("product", [])