Changeset 13438 for main/waeup.aaue/trunk/src

Timestamp:

11 Nov 2015, 19:49:12 (9 years ago)

Author:

Henrik Bettermann

Message:

revert to the old Interswitch surcharge.

Location:

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

Files:

• interswitch/browser.py (modified) (1 diff)
• interswitch/tests.py (modified) (5 diffs)
• students/tests/test_browser.py (modified) (1 diff)

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

@@ -50 +50 @@
 
 def gateway_net_amt(fee):
-    if fee > 2000:
+    if fee > GATEWAY_AMT:
         return fee - GATEWAY_AMT
-    return round(fee * 0.985, 2)
+    return 0.0
 
 def contr_agreement(student):

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

@@ -121 +121 @@
         self.browser.getLink(self.value).click()
         self.assertTrue('Amount Authorized' in self.browser.contents)
-        # 50250 + 0.985 * (1000 + 500)
-        self.assertTrue('<span>51727.5</span>' in self.browser.contents)
+        # 50250 + 1000 + 500 -500
+        self.assertTrue('<span>51250.0</span>' in self.browser.contents)
         self.payment_url = self.browser.url
         self.browser.getLink("CollegePAY", index=0).click()
@@ -137 +137 @@
         self.assertEqual(self.student.current_mode, 'ug_pt')
         self.assertTrue(
-            '<input type="hidden" name="amount" value="5172750" />'
+            '<input type="hidden" name="amount" value="5125000" />'
             in self.browser.contents)
         self.assertTrue(
@@ -204 +204 @@
         self.browser.getLink(self.value).click()
         self.assertTrue('Amount Authorized' in self.browser.contents)
-        # 40250 + 0.985 * (2000 + 800)
-        self.assertTrue('<span>43008.0</span>' in self.browser.contents)
+        # 40250 + 2000 + 800 - 500
+        self.assertTrue('<span>42550.0</span>' in self.browser.contents)
         self.payment_url = self.browser.url
         self.browser.getLink("CollegePAY", index=0).click()
@@ -212 +212 @@
         self.assertTrue('Total Amount Authorized:' in self.browser.contents)
         self.assertTrue(
-            '<input type="hidden" name="amount" value="4300800" />'
+            '<input type="hidden" name="amount" value="4255000" />'
             in self.browser.contents)
         self.assertTrue(
@@ -276 +276 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="Concessional Fee" item_amt="154349" '
+            'item_name="Concessional Fee" item_amt="131700" '
             'bank_id="117" acct_num="1010835352"'
             in self.browser.contents)

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 = 1015.23
-        self.app['configuration']['2004'].welfare_fee = 507.61
+        self.app['configuration']['2004'].union_fee = 1250.0
+        self.app['configuration']['2004'].welfare_fee = 750.0
         self.student.nationality = u'NG'
         # Login