Minor tweaks to credit card payment summary displays

As suggested by Jordan, centralize the logic in a
ProgramAccountingController function.  And use a better variable name for
the line item type.

Author: pricem

esp/esp/accounting/controllers.py

@@ -278,6 +278,13 @@ def remove_pending_transfers(self, users):
             we shouldn't be expecting their money.  """
         self.all_transfers().filter(user__in=users, executed=False).delete()
 
+    def payments_summary(self):
+        """ Return a tuple with the number and total dollar amount of payments
+            that have been made so far. """
+        payment_li_type = self.default_payments_lineitemtype()
+        payments = Transfer.objects.filter(line_item=payment_li_type)
+        return (payments.count(), payments.aggregate(total=Sum('amount_dec'))['total'])
+
 class IndividualAccountingController(ProgramAccountingController):
     def __init__(self, program, user, *args, **kwargs):
         super(IndividualAccountingController, self).__init__(program, *args, **kwargs)

esp/esp/program/modules/handlers/creditcardviewer_cybersource.py

@@ -67,15 +67,14 @@ def viewpay_cybersource(self, request, tl, one, two, module, extra, prog):
             payment_table.append((student, iac.get_transfers(), iac.amount_requested(), iac.amount_due()))
 
         #   Also fetch summary information about the payments
-        lt = pac.default_payments_lineitemtype()
-        payments = Transfer.objects.filter(line_item=lt)
+        (num_payments, total_payment) = pac.payments_summary()
 
         context = {
             'program': prog,
             'payment_table': payment_table,
             'num_students': len(student_list),
-            'num_payments': payments.count(),
-            'total_payment': payments.aggregate(total=Sum('amount_dec'))['total'],
+            'num_payments': num_payments,
+            'total_payment': total_payment,
         }
 
         return render_to_response(self.baseDir() + 'viewpay_cybersource.html', request, context)

esp/esp/program/modules/handlers/jsondatamodule.py

@@ -764,11 +764,11 @@ def student_max_count(clslist):
             dictOut["stats"].append({"id": "splashinfo", "data": splashinfo_data})
 
         #   Add accounting stats
-        lt = ProgramAccountingController(prog).default_payments_lineitemtype()
-        payments = Transfer.objects.filter(line_item=lt)
+        pac = ProgramAccountingController(prog)
+        (num_payments, total_payment) = pac.payments_summary()
         accounting_data = {
-            'num_payments': payments.count(),
-            'total_payments': payments.aggregate(total=Sum('amount_dec'))['total'],
+            'num_payments': num_payments,
+            'total_payments': total_payment,
         }
         dictOut["stats"].append({"id": "accounting", "data": accounting_data})