Changeset 14897 for main/waeup.uniben/trunk/src

Timestamp:

14 Nov 2017, 11:08:44 (7 years ago)

Author:

Henrik Bettermann

Message:

Adjust acceptance/clearance fee.

Location:

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

Files:

• tests/test_browser.py (modified) (4 diffs)
• utils.py (modified) (1 diff)

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

@@ -325 +325 @@
         #                   self.browser.contents)
         #self.browser.open(self.payments_path + '/addop')
-        # We can't test clearance payment ticket creation at the moment,
-        # since Uniben decided to deactivate clearance for ug students.
-        #self.browser.getControl(name="form.p_category").value = ['clearance']
-        #self.browser.getControl("Create ticket").click()
-        #self.assertMatches('...ticket created...',
-        #                   self.browser.contents)
+
+        self.browser.getControl(name="form.p_category").value = ['clearance']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        self.assertTrue('<td>60000.0</td>' in self.browser.contents)
         self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
@@ -351 +351 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
-
 
         #self.assertMatches('...You have not yet paid your current/active session...',
@@ -360 +359 @@
         #self.browser.getControl(name="form.p_category").value = ['schoolfee']
         #self.browser.getControl("Create ticket").click()
-
 
         self.assertMatches('...ticket created...',
@@ -640 +638 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 45000.0)
+        self.assertEqual(payment.amount_auth, 60000.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)

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

@@ -263 +263 @@
             if p_item is None:
                 return _('Study course data are incomplete.'), None
-            #if student.faccode == 'JUPEB':
-            #    return _('No payment required.'), None
-            if student.faccode.startswith('FCETA'):
+            if student.faccode == 'JUPEB':
+                amount = 50000.0
+            elif student.faccode.startswith('FCETA'):
                 # ASABA and AKOKA
                 amount = 30000.0
             elif p_item in ('BSCANA', 'BSCMBC', 'BMLS', 'BSCNUR', 'BSCPHS', 'BDS',
                 'MBBSMED', 'MBBSNDU', 'BSCPTY'):
-                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
+                amount = 80000.0
+            else:
+                amount = 60000.0
         elif category == 'schoolfee':
             try: