Changeset 15106 for main

Timestamp:

13 Aug 2018, 06:14:51 (6 years ago)

Author:

Henrik Bettermann

Message:

Add payment category.

Location:

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

Files:

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

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

@@ -124 +124 @@
         )
 
+    development_fee = schema.Float(
+        title = _(u'Development Fee'),
+        default = 0.0,
+        required = False,
+        )
+
     remita_enabled = schema.Bool(
         title = _(u'Remita integration enabled'),

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

@@ -251 +251 @@
         self.browser.open(self.payments_path)
         self.browser.getLink("Add current session payment ticket").click()
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...Amount could not be determined...',

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

@@ -231 +231 @@
             and student.current_mode == 'special_ft':
             amount = 80000.0
+        elif category == 'develop' and student.is_postgrad:
+            amount = academic_session.development_fee
         elif category == 'bed_allocation':
             p_item = self.getAccommodationDetails(student)['bt']

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

@@ -89 +89 @@
         #'pharmd_1':'Clerkship Fee',
         'pharmd_2':'Module 1 Fee',
+        'develop':'Development Fee',
         }
 
@@ -108 +109 @@
         #'pharmd_1':'PharmD Clerkship Fee (1st school fee prepayment)',
         'pharmd_2':'PharmD Module 1 Fee (school fee prepayment)',
+        'develop':'Development Fee',
         }