Changeset 13414 for main/waeup.aaue/trunk/src/waeup/aaue/students

Timestamp:

9 Nov 2015, 07:08:21 (9 years ago)

Author:

Henrik Bettermann

Message:

Determine net amount instead of gateway reduction. This is much easier to handle.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• utils.py (modified) (3 diffs)

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.interswitch.browser import gateway_net_amt
 from waeup.aaue.interfaces import MessageFactory as _
 
@@ -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)
+            welfare_fee = gateway_net_amt(academic_session.welfare_fee)
+            union_fee = gateway_net_amt(academic_session.union_fee)
             text += (', %s Naira Student Welfare Assurance Fee and %s Naira Students\' Union Dues'
                      % (welfare_fee, union_fee))
         elif self.context.p_category in (
             'clearance_incl', 'clearance_medical_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)
+            matric_gown_fee = gateway_net_amt(academic_session.matric_gown_fee)
+            lapel_fee = gateway_net_amt(academic_session.lapel_fee)
             text += (', %s Naira Matriculation Gown Fee and %s Naira Lapel/File Fee'
                      % (matric_gown_fee, lapel_fee))

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

@@ -24 +24 @@
 from waeup.kofa.accesscodes import create_accesscode
 from waeup.kofa.students.utils import trans
-from waeup.aaue.interswitch.browser import dynamic_gateway_amt
+from waeup.aaue.interswitch.browser import gateway_net_amt
 from waeup.aaue.interfaces import MessageFactory as _
 
@@ -145 +145 @@
                     # Otherwise we can't add somtehing
                     amount = 0.0
-                amount += academic_session.matric_gown_fee + \
-                    academic_session.lapel_fee - \
-                    dynamic_gateway_amt(academic_session.matric_gown_fee) -\
-                    dynamic_gateway_amt(academic_session.lapel_fee)
+                amount += gateway_net_amt(academic_session.matric_gown_fee) + \
+                    gateway_net_amt(academic_session.lapel_fee)
         elif category == 'late_registration':
             amount = academic_session.late_registration_fee
@@ -183 +181 @@
                     # Otherwise we can't add somtehing
                     amount = 0.0
-                amount += academic_session.welfare_fee + \
-                    academic_session.union_fee - \
-                    dynamic_gateway_amt(academic_session.welfare_fee) -\
-                    dynamic_gateway_amt(academic_session.union_fee)
+                amount += gateway_net_amt(academic_session.welfare_fee) + \
+                    gateway_net_amt(academic_session.union_fee)
         if amount in (0.0, None):
             return _(u'Amount could not be determined.'), None