Changeset 13408

Timestamp:

7 Nov 2015, 22:02:34 (9 years ago)

Author:

Henrik Bettermann

Message:

Use correct p_session value from payment ticket.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• interswitch/browser.py (modified) (1 diff)
• interswitch/tests.py (modified) (1 diff)
• students/browser.py (modified) (3 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py

@@ -137 +137 @@
 
         student = self.student
-        current_session = student['studycourse'].current_session
+        p_session = self.context.p_session
         try:
-            academic_session = grok.getSite()[
-                'configuration'][str(current_session)]
+            academic_session = grok.getSite()['configuration'][str(p_session)]
         except KeyError:
             self.flash(_(u'Session configuration object is not available.'),

main/waeup.aaue/trunk/src/waeup/aaue/interswitch/tests.py

@@ -285 +285 @@
         acc_payment = createObject('waeup.StudentOnlinePayment')
         acc_payment.p_state = 'unpaid'
+        acc_payment.p_session = 2004
         acc_payment.p_category = 'clearance'
         acc_payment.p_id = 'xyz'

main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py

@@ -53 +53 @@
     ICustomStudentPersonalEdit,
     ICustomUGStudentClearance)
+from waeup.aaue.interswitch.browser import dynamic_gateway_amt
 from waeup.aaue.interfaces import MessageFactory as _
 
@@ -136 +137 @@
     @property
     def note(self):
-        student = self.context.student
-        current_session = student['studycourse'].current_session
+        p_session = self.context.p_session
         try:
-            academic_session = grok.getSite()['configuration'][str(current_session)]
+            academic_session = grok.getSite()['configuration'][str(p_session)]
         except KeyError:
             academic_session = None
@@ -145 +145 @@
         text += '250.0 Naira Transaction Charge'
         if self.context.p_category == 'schoolfee_incl' and academic_session:
+            welfare_fee = academic_session.welfare_fee - dynamic_gateway_amt(
+                academic_session.welfare_fee)
+            union_fee = academic_session.union_fee - dynamic_gateway_amt(
+                academic_session.union_fee)
             text += (', %s Naira Student Welfare Assurance Fee and %s Naira Students\' Union Dues'
-                     % (academic_session.welfare_fee, academic_session.union_fee))
+                     % (welfare_fee, union_fee))
         elif self.context.p_category == 'clearance_incl' and academic_session:
+            matric_gown_fee = academic_session.matric_gown_fee - dynamic_gateway_amt(
+                academic_session.matric_gown_fee)
+            lapel_fee = academic_session.lapel_fee - dynamic_gateway_amt(
+                academic_session.lapel_fee)
             text += (', %s Naira Matriculation Gown Fee and %s Naira Lapel/File Fee'
-                     % (academic_session.matric_gown_fee, academic_session.lapel_fee))
+                     % (matric_gown_fee, lapel_fee))
         return text + '.'