Changeset 13378

Timestamp:

2 Nov 2015, 08:48:45 (9 years ago)

Author:

Henrik Bettermann

Message:

Prepare basis for 2-school (PT and Regular) configuration.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• tests.py (modified) (3 diffs)

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

@@ -39 +39 @@
 CURRENCY = '566'
 GATEWAY_AMT = 250.0
-#QUERY_URL = 'https://webpay.interswitchng.com/paydirect/services/TransactionQueryURL.aspx'
-#QUERY_URL = 'https://testwebpay.interswitchng.com/test_paydirect/services/TransactionQueryURL.aspx'
-
-#POST_ACTION = 'https://webpay.interswitchng.com/paydirect/webpay/pay.aspx'
-#POST_ACTION = 'https://testwebpay.interswitchng.com/test_paydirect/webpay/pay.aspx'
-#POST_ACTION = 'https://stageserv.interswitchng.com/test_paydirect/pay'
 POST_ACTION = 'https://webpay.interswitchng.com/paydirect/pay'
 
 HOST = 'webpay.interswitchng.com'
-#HOST = 'stageserv.interswitchng.com'
 HTTPS = True
 
 URL = '/paydirect/services/TransactionQueryWs.asmx'
-#URL = '/test_paydirect/services/TransactionQueryWS.asmx'
 httplib.HTTPSConnection.debuglevel = 0
 
@@ -165 +157 @@
 
         if self.context.p_category == 'schoolfee':
-            if student.faccode == 'FCETA':
-                xmldict['institution_acct'] = '1190118227'
-                xmldict['institution_bank_id'] = '123'
-            else:
-                xmldict['institution_bank_id'] = '7'
-                xmldict['institution_acct'] = '1014847058'
+            xmldict['institution_bank_id'] = '7'
+            xmldict['institution_acct'] = '1014847058'
             if student.current_mode == 'found':
                 self.pay_item_id = '103'

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

@@ -109 +109 @@
         super(InterswitchTestsStudents, self).setUp()
 
-    def test_interswitch_form_school_fees(self):
+    def test_interswitch_form_pt_school_fees(self):
+        self.certificate.study_mode = 'ug_pt'
         self.student['studycourse'].entry_session = 2013
         self.student['studycourse'].certificate.school_fee_1 = 51750.0
@@ -143 +144 @@
         self.assertMatches('...Total Amount Authorized:...',
                            self.browser.contents)
-        self.assertEqual(self.student.current_mode, 'ug_ft')
+        self.assertEqual(self.student.current_mode, 'ug_pt')
         self.assertMatches(
             '...<input type="hidden" name="amount" value="5175000" />...',
@@ -152 +153 @@
 
 
-    def test_interswitch_form_acceptance_fees(self):
-        self.app['configuration']['2004'].clearance_fee = 43050.0
+    def test_interswitch_form_pt_acceptance_fees(self):
+        self.certificate.study_mode = 'ug_pt'
+        self.app['configuration']['2004'].clearance_fee_pt = 43050.0
         # Manager can access InterswitchForm
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')