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

Timestamp:

11 Nov 2015, 13:40:53 (9 years ago)

Author:

Henrik Bettermann

Message:

Determine gateway amount for amounts <= 2000 Naira.

Fix note on payment slip.

Location:

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

Files:

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

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

@@ -146 +146 @@
             welfare_fee = gateway_net_amt(academic_session.welfare_fee)
             union_fee = gateway_net_amt(academic_session.union_fee)
-            text += ('School Fee'
-                     ', %s Naira Students\' Union Dues'
-                     ', %s Naira Student Welfare Assurance Fee'
+            text += ('School Fee, '
+                     '%s Naira Students\' Union Dues, '
+                     '%s Naira Student Welfare Assurance Fee and '
                      % (union_fee, welfare_fee))
         elif self.context.p_category in (
@@ -154 +154 @@
             matric_gown_fee = gateway_net_amt(academic_session.matric_gown_fee)
             lapel_fee = gateway_net_amt(academic_session.lapel_fee)
-            text += ('Acceptance Fee'
-                     ', %s Naira Matriculation Gown Fee'
-                     ', %s Naira Lapel/File Fee'
+            text += ('Acceptance Fee, '
+                     '%s Naira Matriculation Gown Fee, '
+                     '%s Naira Lapel/File Fee and '
                      % (matric_gown_fee, lapel_fee))
-        return text + ' and 250.0 Naira Transaction Charge.'
+        return text + '250.0 Naira Transaction Charge.'
 
 class CustomStudyLevelDisplayFormPage(StudyLevelDisplayFormPage):

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

@@ -300 +300 @@
         self.student['studycourse'].entry_session = 2013
         self.student['studycourse'].certificate.school_fee_1 = 50250.0
-        self.app['configuration']['2004'].union_fee = 1000.0
-        self.app['configuration']['2004'].welfare_fee = 500.0
+        self.app['configuration']['2004'].union_fee = 1015.23
+        self.app['configuration']['2004'].welfare_fee = 507.61
         self.student.nationality = u'NG'
         # Login
@@ -319 +319 @@
         self.browser.getLink(value).click()
         self.assertTrue('Amount Authorized' in self.browser.contents)
-        self.assertEqual(self.student['payments'][value].amount_auth, 51250.0)
+        self.assertEqual(self.student['payments'][value].amount_auth, 51750.0)
         self.browser.open(self.browser.url + '/payment_slip.pdf')
         self.assertEqual(self.browser.headers['Status'], '200 Ok')