Changeset 14237 for main

Timestamp:

27 Oct 2016, 21:07:05 (8 years ago)

Author:

Henrik Bettermann

Message:

Clearance fee and provider amount do increase only for students starting in 2016.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

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

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

@@ -61 +61 @@
     currency = CURRENCY
     product_id = PRODUCT_ID
+
+    def dynamic_provider_amt(self, student):
+        if student.entry_session >= 2016:
+            return 2500.0
+        return 1500.0
 
     def update(self):
@@ -83 +88 @@
         if self.context.p_category == 'schoolfee':
             if not self.context.p_item == 'Balance':
-                provider_amt = 2500.0
+                provider_amt = self.dynamic_provider_amt(student)
             if student.current_mode.endswith('_ft'):
                 self.pay_item_id = '5700'
@@ -92 +97 @@
         elif self.context.p_category == 'clearance':
             self.pay_item_id = '5702'
-            provider_amt = 2500.0
+            provider_amt = self.dynamic_provider_amt(student)
         elif self.context.p_category == 'gown':
             self.pay_item_id = '5704'

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

@@ -95 +95 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="School Fee" item_amt="3735000" bank_id="8" acct_num="2017506430"'
-            in self.browser.contents)
-        self.assertTrue(
-            'item_name="BT Education" item_amt="250000" bank_id="117" acct_num="1014261520"'
+            'item_name="School Fee" item_amt="3835000" bank_id="8" acct_num="2017506430"'
+            in self.browser.contents)
+        self.assertTrue(
+            'item_name="BT Education" item_amt="150000" bank_id="117" acct_num="1014261520"'
             in self.browser.contents)
 
@@ -130 +130 @@
         self.browser.getLink("CollegePAY", index=0).click()
         # Split amounts have been set.
-        self.assertEqual(self.student['payments'][value].provider_amt, 2500.0)
+        self.assertEqual(self.student['payments'][value].provider_amt, 1500.0)
         self.assertEqual(self.student['payments'][value].gateway_amt, 150.0)
         self.assertTrue('<input type="hidden" name="pay_item_id" value="5701" />'
@@ -138 +138 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="School Fee" item_amt="1735000" bank_id="8" acct_num="2017506430"'
-            in self.browser.contents)
-        self.assertTrue(
-            'item_name="BT Education" item_amt="250000" bank_id="117" acct_num="1014261520"'
+            'item_name="School Fee" item_amt="1835000" bank_id="8" acct_num="2017506430"'
+            in self.browser.contents)
+        self.assertTrue(
+            'item_name="BT Education" item_amt="150000" bank_id="117" acct_num="1014261520"'
             in self.browser.contents)
 

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

@@ -606 +606 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 50000.0)
+        self.assertEqual(payment.amount_auth, 45000.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)

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

@@ -247 +247 @@
             elif p_item in ('BSCANA', 'BSCMBC', 'BMLS', 'BSCNUR', 'BSCPHS', 'BDS',
                 'MBBSMED', 'MBBSNDU'):
-                amount = 70000.0
-            else:
-                amount = 50000.0
+                amount = 65000.0
+            else:
+                amount = 45000.0
+            # Clearance fee and provider amount have been increased
+            # for new students.
+            if student.entry_session >= 2016:
+                amount += 5000.0
         elif category == 'schoolfee':
             try: