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

Timestamp:

1 Mar 2016, 11:31:01 (9 years ago)

Author:

Henrik Bettermann

Message:

Disable concessional fee requirement.

Location:

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

Files:

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

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

@@ -444 +444 @@
 
     def test_set_matric_number(self):
-        payment = createObject('waeup.StudentOnlinePayment')
-        payment.p_category = u'concessional'
-        payment.p_id = u'anyid'
-        payment.p_state = u'paid'
-        self.student['payments']['anykey'] = payment
+        #payment = createObject('waeup.StudentOnlinePayment')
+        #payment.p_category = u'concessional'
+        #payment.p_id = u'anyid'
+        #payment.p_state = u'paid'
+        #self.student['payments']['anykey'] = payment
         # Login as student
         self.browser.open(self.login_path)

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

@@ -130 +130 @@
         site['configuration'].next_matric_integer_3 = 1
         self.student.matric_number = None
-        msg, mnumber = utils.setMatricNumber(self.student)
-        self.assertEqual(msg, 'Matriculation number cannot be set.')
-        payment = createObject('waeup.StudentOnlinePayment')
-        payment.p_category = u'concessional'
-        payment.p_id = u'anyid'
-        payment.p_state = u'paid'
-        self.student['payments']['anykey'] = payment
+        #msg, mnumber = utils.setMatricNumber(self.student)
+        #self.assertEqual(msg, 'Matriculation number cannot be set.')
+        #payment = createObject('waeup.StudentOnlinePayment')
+        #payment.p_category = u'concessional'
+        #payment.p_id = u'anyid'
+        #payment.p_state = u'paid'
+        #self.student['payments']['anykey'] = payment
         # Regular ft students have a matric number without leading constant.
         msg, mnumber = utils.setMatricNumber(self.student)

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

@@ -76 +76 @@
             student.current_mode == 'found':
             return _('Matriculation number cannot be set.'), None
-        if student.current_mode not in ('mug_ft', 'mde_ft') and \
-            not self._concessionalPaymentMade(student):
-            return _('Matriculation number cannot be set.'), None
+        #if student.current_mode not in ('mug_ft', 'mde_ft') and \
+        #    not self._concessionalPaymentMade(student):
+        #    return _('Matriculation number cannot be set.'), None
         if student.is_postgrad:
             next_integer = grok.getSite()['configuration'].next_matric_integer_3