Changeset 13855 for main/waeup.aaue/trunk

Timestamp:

2 May 2016, 10:13:16 (8 years ago)

Author:

Henrik Bettermann

Message:

See ticket #213.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

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

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

@@ -333 +333 @@
         self.browser.getControl("Create ticket").click()
         self.assertTrue(
-            'Another school fee payment for this session has already been made'
-            in self.browser.contents)
+            'You must chose a payment which includes additional fees'
+            in self.browser.contents)
+        #self.assertTrue(
+        #    'Another school fee payment for this session has already been made'
+        #    in self.browser.contents)
         # Test hostel maintenance payments
         self.browser.open(self.student_path + '/payments')

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

@@ -197 +197 @@
             if student.state not in (ADMITTED, CLEARANCE, REQUESTED, CLEARED):
                 return _(u'Acceptance Fee payments not allowed.'), None
+            if student.current_mode in (
+                'ug_ft', 'ug_pt', 'de_ft', 'de_pt',
+                'transfer', 'mug_ft', 'mde_ft') \
+                and category != 'clearance_incl':
+                    return _("Additional fees must be included."), None
             if student.faccode == 'FP':
                 amount = academic_session.clearance_fee_fp
@@ -231 +236 @@
             if student.is_postgrad and category != 'schoolfee':
                 return _("No additional fees required."), None
+            if student.current_mode in (
+                'ug_ft', 'ug_pt', 'de_ft', 'de_pt',
+                'transfer', 'mug_ft', 'mde_ft') \
+                and not category in (
+                'schoolfee_incl', 'schoolfee_1', 'schoolfee_2'):
+                    return _("You must chose a payment which includes "
+                             "additional fees."), None
             if category in ('schoolfee_1', 'schoolfee_2'):
                 if student.current_mode == 'ug_pt':