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

Timestamp:

5 Dec 2019, 16:50:14 (5 years ago)

Author:

Henrik Bettermann

Message:

Reduce transaction charge from 250 to 200.

Location:

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

Files:

• applicants/tests/test_browser.py (modified) (2 diffs)
• interswitch/browser.py (modified) (1 diff)
• interswitch/tests.py (modified) (12 diffs)
• students/tests/test_browser.py (modified) (4 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests/test_browser.py

@@ -288 +288 @@
         self.browser.getControl(name="form.email").value = 'xx@yy.zz'
         self.browser.getControl(name="form.nationality").value = ['NG']
-        #self.browser.getControl(name="form.sex").value = ['f']
         self.browser.getControl(name="form.firstname").value = 'Angela'
         self.browser.getControl(name="form.lastname").value = 'Merkel'
@@ -306 +305 @@
         self.browser.getControl("Add online payment ticket").click()
         self.assertTrue('Payment ticket created' in self.browser.contents)
-        self.assertTrue('<span>100.0</span>' in self.browser.contents)
-        self.assertEqual(applicant.values()[0].amount_auth, 100.0)
+        self.assertTrue('<span>200.0</span>' in self.browser.contents)
+        self.assertEqual(applicant.values()[0].amount_auth, 200.0)
         return
 

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

@@ -42 +42 @@
 INSTITUTION_NAME = 'AAU Ekpoma'
 CURRENCY = '566'
-GATEWAY_AMT = 250.0
+GATEWAY_AMT = 200.0
 POST_ACTION = 'https://webpay.interswitchng.com/paydirect/pay'
 

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

@@ -88 +88 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="Application Fee" item_amt="775000" bank_id="117" acct_num="1010835352"'
+            'item_name="Application Fee" item_amt="780000" bank_id="117" acct_num="1010835352"'
             in self.browser.contents)
         self.assertTrue(
@@ -119 +119 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="Application Fee" item_amt="575000" bank_id="117" acct_num="1010835352"'
+            'item_name="Application Fee" item_amt="580000" bank_id="117" acct_num="1010835352"'
             in self.browser.contents)
         self.assertTrue(
@@ -153 +153 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="Application Fee" item_amt="775000" bank_id="117" acct_num="1010835352"'
+            'item_name="Application Fee" item_amt="780000" bank_id="117" acct_num="1010835352"'
             in self.browser.contents)
         self.assertTrue(
@@ -184 +184 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="Application Fee" item_amt="775000" bank_id="7" acct_num="1014847058"'
+            'item_name="Application Fee" item_amt="780000" bank_id="7" acct_num="1014847058"'
             in self.browser.contents)
 
@@ -208 +208 @@
         self.certificate.study_mode = 'ug_pt'
         self.student['studycourse'].entry_session = 2013
-        self.student['studycourse'].certificate.school_fee_1 = 50250.0
+        self.student['studycourse'].certificate.school_fee_1 = 50200.0
         self.app['configuration']['2004'].union_fee = 1000.0
         self.app['configuration']['2004'].welfare_fee = 500.0
@@ -224 +224 @@
         self.browser.getLink(self.value).click()
         self.assertTrue('Amount Authorized' in self.browser.contents)
-        # 50250 + 1000 + 500 -500
-        self.assertTrue('<span>51250.0</span>' in self.browser.contents)
+        # 50200 + 1000 + 500 - 400
+        self.assertTrue('<span>51300.0</span>' in self.browser.contents)
         self.payment_url = self.browser.url
         self.browser.getLink("Pay via Interswitch", index=0).click()
@@ -240 +240 @@
         self.assertEqual(self.student.current_mode, 'ug_pt')
         self.assertTrue(
-            '<input type="hidden" name="amount" value="5125000" />'
+            '<input type="hidden" name="amount" value="5130000" />'
             in self.browser.contents)
         self.assertTrue(
@@ -285 +285 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="School Fee Plus" item_amt="4750000" bank_id="117" '
+            'item_name="School Fee Plus" item_amt="4755000" bank_id="117" '
             'acct_num="1010827641"' in self.browser.contents)
 
     def test_interswitch_form_pt_acceptance_fees(self):
         self.certificate.study_mode = 'ug_pt'
-        self.app['configuration']['2004'].clearance_fee_ug_pt = 40250.0
+        self.app['configuration']['2004'].clearance_fee_ug_pt = 40200.0
         self.app['configuration']['2004'].matric_gown_fee = 2000.0
         self.app['configuration']['2004'].lapel_fee = 800.0
@@ -306 +306 @@
         self.browser.getLink(self.value).click()
         self.assertTrue('Amount Authorized' in self.browser.contents)
-        # 40250 + 2000 + 800 - 500
-        self.assertTrue('<span>42550.0</span>' in self.browser.contents)
+        # 40200 + 2000 + 800 - 400
+        self.assertTrue('<span>42600.0</span>' in self.browser.contents)
         self.payment_url = self.browser.url
         self.browser.getLink("Pay via Interswitch", index=0).click()
@@ -314 +314 @@
         self.assertTrue('Total Amount Authorized:' in self.browser.contents)
         self.assertTrue(
-            '<input type="hidden" name="amount" value="4255000" />'
+            '<input type="hidden" name="amount" value="4260000" />'
             in self.browser.contents)
         self.assertTrue(
@@ -347 +347 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="Acceptance Fee Plus" item_amt="4130000" bank_id="117" '
+            'item_name="Acceptance Fee Plus" item_amt="4135000" bank_id="117" '
             'acct_num="1010827641"' in self.browser.contents)
 
@@ -378 +378 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="Concessional Fee" item_amt="131700" '
+            'item_name="Concessional Fee" item_amt="136700" '
             'bank_id="117" acct_num="1010827641"'
             in self.browser.contents)

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

@@ -274 +274 @@
         self.assertEqual(self.student['payments'].values()[0].p_category, 'schoolfee_1')
         self.assertEqual(self.student['payments'].values()[1].p_category, 'schoolfee_2')
-        # (6666-250)/2 + 1250 + 750 - 500 + 250
-        self.assertEqual(self.student['payments'].values()[0].amount_auth, 4958.0)
-        # (6666-250)/2 + 250
-        self.assertEqual(self.student['payments'].values()[1].amount_auth, 3458.0)
+        # (6666-200)/2 + 1250 + 750 - 400 + 200
+        self.assertEqual(self.student['payments'].values()[0].amount_auth, 5033.0)
+        # (6666-200)/2 + 200
+        self.assertEqual(self.student['payments'].values()[1].amount_auth, 3433.0)
         # The  two payments belong to the same session and level.
         self.assertEqual(self.student['payments'].values()[0].p_session, 2015)
@@ -309 +309 @@
         self.browser.getControl("Create ticket").click()
         self.assertTrue('ticket created' in self.browser.contents)
-        # (5666-250)/2 + 1250 + 750 - 500 + 250
-        self.assertEqual(self.student['payments'].values()[2].amount_auth, 4458.0)
-        # (5666-250)/2 + 250
-        self.assertEqual(self.student['payments'].values()[3].amount_auth, 2958.0)
+        # (5666-200)/2 + 1250 + 750 - 400 + 200
+        self.assertEqual(self.student['payments'].values()[2].amount_auth, 4533.0)
+        # (5666-200)/2 + 200
+        self.assertEqual(self.student['payments'].values()[3].amount_auth, 2933.0)
         # The last two payments belong to the same session and level.
         self.assertEqual(self.student['payments'].values()[2].p_session, 2016)
@@ -613 +613 @@
         self.student['studycourse'].current_session = 2016
         self.student['studycourse'].entry_mode = 'ug_ft'
-        self.student['studycourse'].certificate.school_fee_1 = 50250.0
-        self.app['configuration']['2016'].union_fee = 1250.0
-        self.app['configuration']['2016'].welfare_fee = 750.0
-        self.app['configuration']['2016'].id_card_fee = 350.0
+        self.student['studycourse'].certificate.school_fee_1 = 50200.0
+        self.app['configuration']['2016'].union_fee = 1200.0
+        self.app['configuration']['2016'].welfare_fee = 700.0
+        self.app['configuration']['2016'].id_card_fee = 300.0
         self.student.nationality = u'NG'
         # Login
@@ -633 +633 @@
         self.browser.getLink(value).click()
         self.assertTrue('Amount Authorized' in self.browser.contents)
-        # 50250 + 1000 + 500 + 100 = 51850
-        self.assertEqual(self.student['payments'][value].amount_auth, 51850.0)
+        # 50200 + 1200 + 700 + 300 - 600 = 51800
+        self.assertEqual(self.student['payments'][value].amount_auth, 51800.0)
         self.student['payments'][value].r_company = u'interswitch'
         self.browser.open(self.browser.url + '/payment_slip.pdf')