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

Timestamp:

12 Jun 2015, 07:27:02 (9 years ago)

Author:

Henrik Bettermann

Message:

Bypass SFE access code creation also in AAUE.

Location:

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

Files:

• payments.py (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)

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

@@ -22 +22 @@
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
+from zope.schema.interfaces import ConstraintNotSatisfied
+from hurry.workflow.interfaces import IWorkflowInfo
 from waeup.kofa.students.interfaces import IStudentNavigation
 from waeup.kofa.students.payments import (
     StudentOnlinePayment, StudentOnlinePaymentFactory)
+from waeup.kofa.students.workflow import CLEARED
 from waeup.kofa.utils.helpers import attrs_to_fields
 from waeup.kofa.accesscodes import create_accesscode
@@ -44 +47 @@
         return
 
-    def _redeemTicket(self):
+    def redeemTicket(self):
         student = self.student
         if self.p_category in ('schoolfee', 'schoolfee_1'):
+            # Bypass activation code creation if next session
+            # can be started directly.
+            if student['studycourse'].next_session_allowed:
+                try:
+                    if student.state == CLEARED:
+                        IWorkflowInfo(student).fireTransition(
+                            'pay_first_school_fee')
+                        return None
+                    elif student.state == RETURNING:
+                        IWorkflowInfo(student).fireTransition(
+                            'pay_school_fee')
+                        return None
+                    elif student.state == PAID:
+                        IWorkflowInfo(student).fireTransition(
+                            'pay_pg_fee')
+                        return None
+                except ConstraintNotSatisfied:
+                    pass
             # Create SFE access code
             pin, error = create_accesscode(

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

@@ -173 +173 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')
-        # If school fee ticket is paid ...
+        # If school fee ticket is paid, the student is automatically set to
+        # school fee paid...
         ticket = self.student['payments'][sfpt_value].approveStudentPayment()
+        self.assertEqual(self.student.state, 'school fee paid')
         # ... no further school fee ticket can be added.
         self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
-        self.assertMatches('...This type of payment has already been made...',
+        self.assertMatches('...Wrong state...',
                            self.browser.contents)
         self.browser.open(self.payments_path + '/addop')