Changeset 9714

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

Files:

• interfaces.py (modified) (1 diff)
• interswitch/tests.py (modified) (2 diffs)
• students/tests/test_browser.py (modified) (1 diff)
• students/utils.py (modified) (1 diff)

main/waeup.futminna/trunk/src/waeup/futminna/interfaces.py

@@ -39 +39 @@
 
     application_fee = schema.Float(
-        title = _(u'Application Fee (fallback)'),
+        title = _(u'Application Fee'),
+        description = u'20000 Nairas are automatically added ' + \
+                       'if student is in faculty <br>' + \
+                       'EET or ICT or in department ARC.',
         default = 0.0,
         required = False,

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

@@ -95 +95 @@
                            self.browser.contents)
         self.assertMatches(
-            '...<span>20000.0</span>...',
+            '...<span>3456.0</span>...',
             self.browser.contents)
         # Manager can access InterswitchForm
@@ -104 +104 @@
                            self.browser.contents)
         self.assertMatches(
-            '...<input type="hidden" name="amount" value="2000000.0" />...',
+            '...<input type="hidden" name="amount" value="345600.0" />...',
             self.browser.contents)
         self.assertMatches(
-            '...item_name="Acceptance Fee" item_amt="1970000" bank_id="120" acct_num="1750005063"...',
+            '...item_name="Acceptance Fee" item_amt="315600" bank_id="120" acct_num="1750005063"...',
             self.browser.contents)
         # BT does nor charge a fee for clearance

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