Changeset 9714 for main/waeup.futminna/trunk/src/waeup/futminna/students

Timestamp:

23 Nov 2012, 10:51:00 (12 years ago)

Author:

Henrik Bettermann

Message:

Change acceptance fee calculation. This way penalty fees can be added or payment can be disabled via the UI.

Location:

main/waeup.futminna/trunk/src/waeup/futminna/students

Files:

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

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

@@ -171 +171 @@
         self.assertEqual(error, u'Previous session payment not yet implemented.')
 
+        self.app['configuration']['2004'].clearance_fee = 20000.0
         error, payment = utils.setPaymentDetails('clearance',self.student)
         self.assertEqual(payment.p_level, 100)

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

@@ -114 +114 @@
             except (AttributeError, TypeError):
                 return _('Study course data are incomplete.'), None
-            if student.faccode in ['EET','ICT'] or student.depcode in ['ARC']:
-                amount = 25000.0
-            else:
-                amount = 20000.0
+            amount = academic_session.clearance_fee
+            if amount and (student.faccode in [
+                'EET','ICT'] or student.depcode in ['ARC']):
+                amount += 5000.0
         elif category == 'hostel_maintenance':
             current_session = student['studycourse'].current_session