Changeset 10388 for main/waeup.fceokene/trunk/src/waeup/fceokene

Timestamp:

27 Jun 2013, 07:33:45 (12 years ago)

Author:

Henrik Bettermann

Message:

Add Interswitch surcharge to all student fees.

Location:

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

Files:

• interswitch/tests.py (modified) (6 diffs)
• students/tests/test_browser.py (modified) (8 diffs)
• students/utils.py (modified) (2 diffs)

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

@@ -64 +64 @@
                            self.browser.contents)
         self.assertTrue(
-            '<span>12495.0</span>' in self.browser.contents)
+            '<span>12645.0</span>' in self.browser.contents)
         self.payment_url = self.browser.url
 
@@ -93 +93 @@
                            self.browser.contents)
         self.assertTrue(
-            '<input type="hidden" name="amount" value="1249500.0" />'
-            in self.browser.contents)
-        self.assertTrue(
-            'item_name="School Fee" item_amt="934500" bank_id="117" acct_num="1012044015"'
+            '<input type="hidden" name="amount" value="1264500.0" />'
+            in self.browser.contents)
+        self.assertTrue(
+            'item_name="School Fee" item_amt="949500" bank_id="117" acct_num="1012044015"'
             in self.browser.contents)
         self.assertTrue(
@@ -140 +140 @@
                            self.browser.contents)
         self.assertTrue(
-            '<span>4150.0</span>' in self.browser.contents)
+            '<span>4300.0</span>' in self.browser.contents)
         # p_item is not unveiled
         self.assertFalse('Hall 1, Block A, Room 101, Bed A'
@@ -161 +161 @@
                            self.browser.contents)
         self.assertTrue(
-            '<input type="hidden" name="amount" value="415000.0" />'
-            in self.browser.contents)
-        self.assertTrue(
-            'item_name="Hostel Maintenance Fee" item_amt="400000" bank_id="117" acct_num="1012044132"'
+            '<input type="hidden" name="amount" value="430000.0" />'
+            in self.browser.contents)
+        self.assertTrue(
+            'item_name="Hostel Maintenance Fee" item_amt="415000" bank_id="117" acct_num="1012044132"'
             in self.browser.contents)
         # BT does nor charge a fee for maintenance fee
@@ -196 +196 @@
                            self.browser.contents)
         self.assertTrue(
-            '<span>3456.0</span>' in self.browser.contents)
+            '<span>3606.0</span>' in self.browser.contents)
         self.payment_url = self.browser.url
         self.assertEqual(self.student['payments'][value].provider_amt, 0.0)
@@ -212 +212 @@
                            self.browser.contents)
         self.assertTrue(
-            '<input type="hidden" name="amount" value="345600.0" />' in
+            '<input type="hidden" name="amount" value="360600.0" />' in
             self.browser.contents)
         self.assertTrue(
-            'item_name="Acceptance Fee" item_amt="330600" bank_id="8" acct_num="2003670143"'
+            'item_name="Acceptance Fee" item_amt="345600" bank_id="8" acct_num="2003670143"'
             in self.browser.contents)
         # BT does nor charge a fee for maintenance fee

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

@@ -230 +230 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 12495.0)
+        self.assertEqual(payment.amount_auth, 12645.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)
@@ -243 +243 @@
         self.assertEqual(payment.p_level, 200)
         self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 11545.0)
+        self.assertEqual(payment.amount_auth, 11695.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)
 
-        # UG students pay 65150
+        # UG students pay 65800
         self.certificate.study_mode = 'ug_ft'
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
-        self.assertEqual(payment.amount_auth, 65650.0)
+        self.assertEqual(payment.amount_auth, 65800.0)
         self.assertEqual(error, None)
 
@@ -265 +265 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 120.0)
+        self.assertEqual(payment.amount_auth, 270.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)
@@ -272 +272 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 150.0)
+        self.assertEqual(payment.amount_auth, 300.0)
         self.assertEqual(payment.p_item, u'')
         self.assertEqual(error, None)
@@ -285 +285 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 4150.0)
+        self.assertEqual(payment.amount_auth, 4300.0)
         self.assertEqual(payment.p_item, u'My bed coordinates')
         self.assertEqual(error, None)
@@ -293 +293 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 2650.0)
+        self.assertEqual(payment.amount_auth, 2800.0)
         self.assertEqual(payment.p_item, u'My bed coordinates')
         self.assertEqual(error, None)
@@ -300 +300 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 150.0)
+        self.assertEqual(payment.amount_auth, 300.0)
         self.assertEqual(payment.p_item, u'')
         self.assertEqual(error, None)
@@ -307 +307 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 90.0)
+        self.assertEqual(payment.amount_auth, 240.0)
         self.assertEqual(payment.p_item, u'')
         self.assertEqual(error, None)

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

@@ -27 +27 @@
 from waeup.kofa.browser.interfaces import IPDFCreator
 from waeup.kofa.students.utils import trans
+from waeup.fceokene.interswitch.browser import GATEWAY_AMT
 
 class CustomStudentsUtils(NigeriaStudentsUtils):
@@ -253 +254 @@
         payment.p_level = p_level
         payment.p_current = p_current
-        payment.amount_auth = float(amount)
+        # On June 26, 2013 FCEOkene realized that the Interswitch fee
+        # is deducted from their amount. Therefore, we add this fee here.
+        payment.amount_auth = float(amount) + GATEWAY_AMT
         return None, payment