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

Timestamp:

11 Jan 2016, 13:45:34 (9 years ago)

Author:

Henrik Bettermann

Message:

Acceptance Fee is ONLY FOR NEWLY ADMITTED STUDENTS.

Location:

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

Files:

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

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

@@ -95 +95 @@
 
         error, payment = utils.setPaymentDetails('clearance',self.student)
+        self.assertEqual(error, '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)

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

@@ -20 +20 @@
 from zope.component import createObject
 from waeup.kofa.interfaces import (
-    ADMITTED, CLEARED, RETURNING, PAID, academic_sessions_vocab)
+    ADMITTED, CLEARANCE, REQUESTED, CLEARED, RETURNING, PAID,
+    academic_sessions_vocab)
 from kofacustom.nigeria.students.utils import NigeriaStudentsUtils
 from waeup.kofa.accesscodes import create_accesscode
@@ -154 +155 @@
             amount = academic_session.concessional_fee
         elif category.startswith('clearance'):
+            if student.state not in (ADMITTED, CLEARANCE, REQUESTED, CLEARED):
+                return _(u'Acceptance Fee payments not allowed.'), None
             if student.faccode == 'FP':
                 amount = academic_session.clearance_fee_fp