Merge pull request #1559 from learning-unlimited/cc-payment-display

Credit card payment display

Author: benjaminjkraft

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

@@ -37,7 +37,9 @@
 from esp.web.util        import render_to_response
 from datetime            import datetime        
 from django.db.models.query     import Q
+from django.db.models    import Sum
 from esp.users.models    import User, ESPUser
+from esp.accounting.models import Transfer
 from esp.accounting.controllers import ProgramAccountingController, IndividualAccountingController
 from esp.middleware      import ESPError
 
@@ -58,11 +60,21 @@ def viewpay_cybersource(self, request, tl, one, two, module, extra, prog):
         student_list = list(pac.all_students())
         payment_table = []
 
+        #   Fetch detailed information for every student associated with the program
         for student in student_list:
             iac = IndividualAccountingController(prog, student)
             payment_table.append((student, iac.get_transfers(), iac.amount_requested(), iac.amount_due()))
 
-        context = { 'program': prog, 'payment_table': payment_table }
+        #   Also fetch summary information about the payments
+        (num_payments, total_payment) = pac.payments_summary()
+
+        context = {
+            'program': prog,
+            'payment_table': payment_table,
+            'num_students': len(student_list),
+            '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

@@ -55,7 +55,8 @@
 from esp.users.models import UserAvailability
 from esp.utils.decorators import cached_module_view, json_response
 from esp.utils.no_autocookie import disable_csrf_cookie_update
-from esp.accounting.controllers import IndividualAccountingController
+from esp.accounting.controllers import ProgramAccountingController, IndividualAccountingController
+from esp.accounting.models import Transfer
 
 from decimal import Decimal
 
@@ -775,6 +776,15 @@ def student_max_count(clslist):
             }
             dictOut["stats"].append({"id": "splashinfo", "data": splashinfo_data})
 
+        #   Add accounting stats
+        pac = ProgramAccountingController(prog)
+        (num_payments, total_payment) = pac.payments_summary()
+        accounting_data = {
+            'num_payments': num_payments,
+            'total_payments': total_payment,
+        }
+        dictOut["stats"].append({"id": "accounting", "data": accounting_data})
+    
         return dictOut
     stats.cached_function.depend_on_row(ClassSubject, lambda cls: {'prog': cls.parent_program})
     stats.cached_function.depend_on_row(SplashInfo, lambda si: {'prog': si.program})

esp/public/media/scripts/program/modules/adminvitals.js

@@ -9,6 +9,7 @@ function fillStats(data)
     grades = stats.grades;
     shirtnum = stats.shirtnum;
     splashinfo = stats.splashinfo;
+    accounting = stats.accounting;
 
     // Fill in student num data
     $studentnum = $j("#stats_students > .module_group_body");
@@ -158,6 +159,11 @@ function fillStats(data)
     }
     else
         $splashinfo.html("SplashInfo module is not enabled -- no statistics");
+    
+    //  Fill in the accounting table
+    $accounting = $j("#stats_accounting > .module_group_body");
+    $accounting.html("<strong>Number of credit card payments</strong>: " + accounting.data.num_payments + "<br />");
+    $accounting.append("<strong>Total amount of credit card payments</strong>: $" + accounting.data.total_payments.toFixed(2));
 }
 
 function getStats()

esp/templates/program/modules/adminvitals/vitals.html

@@ -16,7 +16,8 @@
         .add("#stats_hours")
         .add("#stats_timeslots")
         .add("#stats_tshirts")
-        .add("#stats_splashinfo");
+        .add("#stats_splashinfo")
+        .add("#stats_accounting");
       $module_group_headers = $module_groups.children(".module_group_header");
       $module_group_headers.click(getStats);
     });
@@ -86,6 +87,12 @@
 	  Loading data...
 	</div>
       </div>
+      <div class="module_group" id="stats_accounting">
+        <div class="module_group_header module_group_expandable">Accounting <span class="expand_collapse_text">(click to expand)</span></div>
+	<div class="module_group_body" style="display:none">
+	  Loading data...
+	</div>
+      </div>
     </div> <!-- div#program_vitals_wrapper -->
   </div>
 </div> <!-- div#program_form -->

esp/templates/program/modules/creditcardviewer_cybersource/viewpay_cybersource.html

@@ -31,6 +31,12 @@
 {% block content %}
 <h1>Credit Card Payments</h1>
 
+<ul>
+<li>Total number of students: {{ num_students }}</li>
+<li>Number of credit card payments so far: {{ num_payments }}</li>
+<li>Amount of credit card payments so far: ${{ total_payment|floatformat:2 }}</li>
+</ul>
+
 <div id="program_form">
 <table>