Changeset 13800 for main/waeup.fceokene/trunk

Timestamp:

5 Apr 2016, 06:12:48 (9 years ago)

Author:

Henrik Bettermann

Message:

Only new students are allowed to pay acceptance fee.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene/students

Files:

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

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

@@ -266 +266 @@
 
         error, payment = utils.setPaymentDetails('clearance',self.student)
+        self.assertEqual(error, u'Acceptance Fee payments not allowed.')
+        IWorkflowState(self.student).setState('cleared')
+        error, payment = utils.setPaymentDetails('clearance',self.student)
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
@@ -403 +406 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
-        self.assertMatches('...Payment temporarily disabled...',
+        self.assertMatches('...This category of payments has been disabled...',
                            self.browser.contents)
         self.certificate.study_mode = 'ug_ft'

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

@@ -20 +20 @@
 from time import time
 from zope.component import createObject, getUtility
-from waeup.kofa.interfaces import CLEARED, RETURNING, PAID
+from waeup.kofa.interfaces import (
+    CLEARED, RETURNING, PAID, ADMITTED, CLEARANCE, REQUESTED)
 from kofacustom.nigeria.students.utils import NigeriaStudentsUtils
 from waeup.kofa.accesscodes import create_accesscode
@@ -113 +114 @@
             except (AttributeError, TypeError):
                 return _('Study course data are incomplete.'), None
+            if student.state not in (ADMITTED, CLEARANCE, REQUESTED, CLEARED):
+                return _(u'Acceptance Fee payments not allowed.'), None
         elif category == 'third_semester' and student.current_mode == 'nce_ft':
             if student.depcode in ARTS:
@@ -270 +273 @@
             return _('This type of payment has already been made.'), None
         if self._isPaymentDisabled(p_session, category, student):
-            return _('Payment temporarily disabled.'), None
+            return _('This category of payments has been disabled.'), None
         payment = createObject(u'waeup.StudentOnlinePayment')
         timestamp = ("%d" % int(time()*10000))[1:]