Changeset 15997 for main

Timestamp:

10 Feb 2020, 10:53:45 (5 years ago)

Author:

Henrik Bettermann

Message:

Fix IJMBE payments.

Location:

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

Files:

• tests/test_browser.py (modified) (2 diffs)
• utils.py (modified) (2 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

@@ -609 +609 @@
     def test_student_schoolfee_payments(self):
         configuration_1 = createObject('waeup.SessionConfiguration')
-        configuration_1.academic_session = 2016
+        configuration_1.academic_session = 2018
         self.app['configuration'].addSessionConfiguration(configuration_1)
         self.certificate.study_mode = 'ug_ft'
-        self.student['studycourse'].entry_session = 2016
-        self.student['studycourse'].current_session = 2016
+        self.student['studycourse'].entry_session = 2018
+        self.student['studycourse'].current_session = 2018
         self.student['studycourse'].entry_mode = 'ug_ft'
         self.student['studycourse'].certificate.school_fee_1 = 50200.0
-        self.app['configuration']['2016'].union_fee = 1200.0
-        self.app['configuration']['2016'].welfare_fee = 700.0
-        self.app['configuration']['2016'].id_card_fee = 300.0
+        self.app['configuration']['2018'].union_fee = 1200.0
+        self.app['configuration']['2018'].welfare_fee = 700.0
+        #self.app['configuration']['2017'].id_card_fee = 300.0
+        self.app['configuration']['2018'].sports_fee = 300.0
+        self.app['configuration']['2018'].library_fee = 300.0
         self.student.nationality = u'NG'
         # Login
@@ -635 +637 @@
         self.browser.getLink(value).click()
         self.assertTrue('Amount Authorized' in self.browser.contents)
-        # 50200 + 1200 + 700 + 300 - 600 = 51800
-        self.assertEqual(self.student['payments'][value].amount_auth, 51800.0)
+        # 50200 + 1200 + 700 + 300 + 300- 800 = 51900
+        self.assertEqual(self.student['payments'][value].amount_auth, 51900.0)
         self.student['payments'][value].r_company = u'interswitch'
         self.browser.open(self.browser.url + '/payment_slip.pdf')

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

@@ -441 +441 @@
             # Add Student Union Fee, Student Id Card Fee, Sports Dev. Fee,
             # Library Dev. Fee and Welfare Assurance
-            if category in ('schoolfee_incl', 'schoolfee_1'):
-                if student.current_mode != 'ijmbe':
-                    amount += gateway_net_amt(academic_session.welfare_fee) + \
-                        gateway_net_amt(academic_session.union_fee)
+            if category in ('schoolfee_incl', 'schoolfee_1') \
+                and student.current_mode != 'ijmbe':
+                amount += gateway_net_amt(academic_session.welfare_fee) + \
+                    gateway_net_amt(academic_session.union_fee)
                 if student.entry_session >= 2018 and student.is_fresh:
                     amount += gateway_net_amt(academic_session.sports_fee)
@@ -451 +451 @@
                     else:
                         amount += gateway_net_amt(academic_session.library_fee)
-                if student.entry_session == 2016 \
-                    and student.entry_mode == 'ug_ft' \
-                    and student.state == CLEARED:
-                    amount += gateway_net_amt(academic_session.id_card_fee)
             # Add non-indigenous fee and session specific penalty fees
             if student.is_postgrad: