Changeset 13854 for main/waeup.aaue/trunk/src

Timestamp:

28 Apr 2016, 07:26:19 (9 years ago)

Author:

Henrik Bettermann

Message:

Change alert message.

Location:

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

Files:

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

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

@@ -88 +88 @@
         self.student.father_name = u'Rudolf'
         error, payment = utils.setPaymentDetails('schoolfee_incl',self.student)
-        self.assertEqual(error, 'This type of payment is not allowed.')
+        self.assertEqual(error, 'No additional fees required.')
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment.p_level, 200)
@@ -100 +100 @@
         IWorkflowState(self.student).setState('cleared')
         error, payment = utils.setPaymentDetails('clearance_incl',self.student)
-        self.assertEqual(error, 'This type of payment is not allowed.')
+        self.assertEqual(error, 'No additional fees required.')
         error, payment = utils.setPaymentDetails('clearance',self.student)
         self.assertEqual(payment.p_level, 100)

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

@@ -210 +210 @@
             elif student.is_postgrad:  # and not part-time
                 if category != 'clearance':
-                    return _("This type of payment is not allowed."), None
+                    return _("No additional fees required."), None
                 amount = academic_session.clearance_fee_pg
             else:
@@ -230 +230 @@
                 return _('Study course data are incomplete.'), None
             if student.is_postgrad and category != 'schoolfee':
-                return _("This type of payment is not allowed."), None
+                return _("No additional fees required."), None
             if category in ('schoolfee_1', 'schoolfee_2'):
                 if student.current_mode == 'ug_pt':
@@ -248 +248 @@
                         amount = gateway_net_amt(amount) / 2 + GATEWAY_AMT
             elif student.state == RETURNING:
-                if student.is_postgrad and category == 'schoolfee_incl':
-                    return _("No additional fees required."), None
                 if not student.father_name:
                     return _("Personal data form is not properly filled."), None