Changeset 13853 for main/waeup.aaue/trunk

Timestamp:

28 Apr 2016, 07:01:01 (9 years ago)

Author:

Henrik Bettermann

Message:

Postgraduate students must not pay additional fees.

Location:

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

Files:

• tests/test_utils.py (modified) (2 diffs)
• utils.py (modified) (2 diffs)

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

@@ -87 +87 @@
         self.assertEqual(error, u'Personal data form is not properly filled.')
         self.student.father_name = u'Rudolf'
+        error, payment = utils.setPaymentDetails('schoolfee_incl',self.student)
+        self.assertEqual(error, 'This type of payment is not allowed.')
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment.p_level, 200)
@@ -97 +99 @@
         self.assertEqual(error, 'Acceptance Fee payments not allowed.')
         IWorkflowState(self.student).setState('cleared')
+        error, payment = utils.setPaymentDetails('clearance_incl',self.student)
+        self.assertEqual(error, 'This type of payment is not allowed.')
         error, payment = utils.setPaymentDetails('clearance',self.student)
         self.assertEqual(payment.p_level, 100)

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

@@ -209 +209 @@
                 amount = academic_session.clearance_fee_med
             elif student.is_postgrad:  # and not part-time
+                if category != 'clearance':
+                    return _("This type of payment is not allowed."), None
                 amount = academic_session.clearance_fee_pg
             else:
@@ -227 +229 @@
             except (AttributeError, TypeError):
                 return _('Study course data are incomplete.'), None
+            if student.is_postgrad and category != 'schoolfee':
+                return _("This type of payment is not allowed."), None
             if category in ('schoolfee_1', 'schoolfee_2'):
                 if student.current_mode == 'ug_pt':