Changeset 11919 for main

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

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/fceokene/interfaces.py (modified) (1 diff)
• src/waeup/fceokene/interswitch/browser.py (modified) (2 diffs)
• src/waeup/fceokene/interswitch/tests.py (modified) (3 diffs)
• src/waeup/fceokene/students/tests/test_browser.py (modified) (3 diffs)
• src/waeup/fceokene/students/utils.py (modified) (3 diffs)

main/waeup.fceokene/trunk/CHANGES.txt

@@ -4 +4 @@
 1.2dev (unreleased)
 ===================
+
+* Add new payment category 'third_semester'.
 
 * Make jamb_reg_number a requird field.

main/waeup.fceokene/trunk/src/waeup/fceokene/interfaces.py

@@ -63 +63 @@
         )
 
-    third_semester_fee = schema.Float(
-        title = _(u'NCE Third Semester Fee'),
-        default = 0.0,
-        required = False,
-        )
-
     def getSessionString():
         """Returns the session string from the vocabulary.

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

@@ -78 +78 @@
         xmldict['institution_item_name'] = self.category
         xmldict['institution_name'] = INSTITUTION_NAME
-        if self.context.p_category == 'schoolfee':
+        if self.context.p_category in ('schoolfee', 'third_semester'):
             self.pay_item_id = '8302'
             if student.current_mode in ('nce_sw','prence',):
@@ -119 +119 @@
 
         # Interswitch amount is not part of the xml data
-        if self.context.p_category == 'schoolfee':
+        if self.context.p_category in ('schoolfee', 'third_semester'):
             xmltext = """<payment_item_detail>
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">

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

@@ -106 +106 @@
             in self.browser.contents)
 
+        # Third semester payment
+        self.app['configuration']['2004'].third_semester_fee = 10000.0
+        self.browser.open(self.payments_path)
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(
+            name="form.p_category").value = ['third_semester']
+        self.browser.getControl("Create ticket").click()
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[1]
+        self.browser.getLink(value).click()
+        self.browser.getLink("CollegePAY", index=0).click()
+
+        self.assertTrue(
+            '<input type="hidden" name="amount" value="691300" />'
+            in self.browser.contents)
+        self.assertTrue(
+            'item_name="NCE Third Semester Fee" item_amt="376300" bank_id="117" acct_num="1012044015"'
+            in self.browser.contents)
+        self.assertTrue(
+            'item_name="FCEOkene Split" item_amt="140000" bank_id="117" acct_num="1012044039"'
+            in self.browser.contents)
+        self.assertTrue(
+            'item_name="BT Education" item_amt="160000" bank_id="31" acct_num="0026781725"'
+            in self.browser.contents)
+
         # Maintenance fee payment
 
@@ -136 +161 @@
                            self.browser.contents)
         ctrl = self.browser.getControl(name='val_id')
-        value = ctrl.options[1]
+        value = ctrl.options[2]
         self.browser.getLink(value).click()
         self.assertMatches('...Amount Authorized...',
@@ -192 +217 @@
                            self.browser.contents)
         ctrl = self.browser.getControl(name='val_id')
-        value = ctrl.options[2]
+        value = ctrl.options[3]
         self.browser.getLink(value).click()
         self.assertMatches('...Amount Authorized...',

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):