Changeset 11919 for main/waeup.fceokene/trunk/src/waeup/fceokene/students

Timestamp:

30 Oct 2014, 21:20:11 (10 years ago)

Author:

Henrik Bettermann

Message:

Configure third semester payment in setPaymentDetails. Session configuration field is is no longer needed.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene/students

Files:

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

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

@@ -84 +84 @@
     def test_manage_payments(self):
         # Add missing configuration data
-        self.app['configuration']['2004'].third_semester_fee = 90.0
         self.app['configuration']['2004'].clearance_fee = 120.0
         self.app['configuration']['2004'].booking_fee = 150.0
@@ -214 +213 @@
 
     def test_set_payment_details(self):
-        self.app['configuration']['2004'].third_semester_fee = 90.0
         self.app['configuration']['2004'].booking_fee = 150.0
         self.app['configuration']['2004'].maint_fee = 180.0
@@ -289 +287 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 240.0)
+        self.assertEqual(payment.amount_auth, 6913.0)
         self.assertEqual(payment.p_item, u'')
         self.assertEqual(error, None)

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

@@ -28 +28 @@
 from waeup.kofa.students.utils import trans
 from waeup.fceokene.interswitch.browser import GATEWAY_AMT
+
+# Very special school fee configuration, should be moved to
+# a seperate file.
+
+ARTS = ('CRS','ISS','HIS','MUS','ECO','GEO','POL','SOS','CCA','ECU',
+        'THA','GED','GSE','PES','SPC','ENG','FRE','ARB','HAU','IGB',
+        'YOR','NCRS','NISS','NHIS','NMUS','NECO','NGEO','NPOL',
+        'NCCA','NECU','NTHA','NGED','NGSE','NPES','NSPC','NENG',
+        'NFRE','NARB','NHAU','NIGB','NYOR','NSOS')
 
 class CustomStudentsUtils(NigeriaStudentsUtils):
@@ -139 +148 @@
                 return _('Study course data are incomplete.'), None
         elif category == 'third_semester' and student.current_mode == 'nce_ft':
-            amount = academic_session.third_semester_fee
+            if student.depcode in ARTS:
+                amount = 5835
+            else:
+                amount = 6763
         elif category == 'schoolfee':
             try:
@@ -146 +158 @@
             except (AttributeError, TypeError):
                 return _('Study course data are incomplete.'), None
-
-            # Very special school fee configuration, should be moved to
-            # a seperate file.
-
-            ARTS = ('CRS','ISS','HIS','MUS','ECO','GEO','POL','SOS','CCA','ECU',
-                    'THA','GED','GSE','PES','SPC','ENG','FRE','ARB','HAU','IGB',
-                    'YOR','NCRS','NISS','NHIS','NMUS','NECO','NGEO','NPOL',
-                    'NCCA','NECU','NTHA','NGED','NGSE','NPES','NSPC','NENG',
-                    'NFRE','NARB','NHAU','NIGB','NYOR','NSOS')
 
             if student.state not in (CLEARED, RETURNING):