Changeset 8434

Timestamp:

12 May 2012, 16:27:14 (12 years ago)

Author:

Henrik Bettermann

Message:

Managers do not 'pay' fees for applicants and students, they approve payments made.

Add respective transitions.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• applicants/browser.py (modified) (1 diff)
• applicants/payment.py (modified) (1 diff)
• applicants/workflow.py (modified) (1 diff)
• payments/payment.py (modified) (1 diff)
• students/browser.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (3 diffs)
• students/workflow.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -730 +730 @@
         transition.
         """
-        allowed_transitions = self.wf_info.getManualTransitions()
+        allowed_transitions = [t for t in self.wf_info.getManualTransitions()
+            if not t[0] == 'pay']
         return [dict(name='', title=_('No transition'))] +[
             dict(name=x, title=y) for x, y in allowed_transitions]

main/waeup.kofa/trunk/src/waeup/kofa/applicants/payment.py

@@ -45 +45 @@
         wf_info = IWorkflowInfo(self.__parent__)
         try:
-            wf_info.fireTransition('pay')
+            wf_info.fireTransition('approve')
         except InvalidTransitionError:
             msg = log = 'Error: %s' % sys.exc_info()[1]

main/waeup.kofa/trunk/src/waeup/kofa/applicants/workflow.py

@@ -65 +65 @@
         transition_id = 'pay',
         title = _('Pay application fee'),
-        msg = _('Fee paid'),
+        msg = _('Payment made'),
+        source = STARTED,
+        destination = PAID),
+
+    Transition(
+        transition_id = 'approve',
+        title = _('Approve payment'),
+        msg = _('Payment approved'),
         source = STARTED,
         destination = PAID),

main/waeup.kofa/trunk/src/waeup/kofa/payments/payment.py

@@ -83 +83 @@
         self.p_state = 'paid'
         user = get_current_principal()
-        r_desc = _('Payment approved by ${a}', mapping = {'a': user.id})
+        user = get_current_principal()
+        if user is None:
+            # in tests
+            usertitle = 'system'
+        else:
+            usertitle = user.title
+        r_desc = _('Payment approved by ${a}', mapping = {'a': usertitle})
         portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
         self.r_desc = translate(r_desc, 'waeup.kofa',

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -362 +362 @@
         transition.
         """
-        allowed_transitions = self.wf_info.getManualTransitions()
+        allowed_transitions = [t for t in self.wf_info.getManualTransitions()
+            if not t[0].startswith('pay')]
         return [dict(name='', title=_('No transition'))] +[
             dict(name=x, title=y) for x, y in allowed_transitions]

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

@@ -725 +725 @@
         self.browser.getControl(name="transition").value = ['clear']
         self.browser.getControl("Save").click()
+        # Managers approve payment, they do not pay
+        self.assertFalse('pay_first_school_fee' in self.browser.contents)
         self.browser.getControl(
-            name="transition").value = ['pay_first_school_fee']
+            name="transition").value = ['approve_first_school_fee']
         self.browser.getControl("Save").click()
         self.browser.getControl(name="transition").value = ['reset6']
@@ -732 +734 @@
         # In state returning the pay_school_fee transition triggers some 
         # changes of attributes
-        self.browser.getControl(name="transition").value = ['pay_school_fee']
+        self.browser.getControl(name="transition").value = ['approve_school_fee']
         self.browser.getControl("Save").click()
         self.assertEqual(student['studycourse'].current_session, 2005) # +1
@@ -1399 +1401 @@
         self.assertEqual(payment.r_amount_approved, 3456.0)
         self.assertEqual(payment.r_code, 'AP')
-        self.assertEqual(payment.r_desc, u'Payment approved by K1000000')
+        self.assertEqual(payment.r_desc, u'Payment approved by Anna Tester')
         # The new CLR-0 pin has been created
         self.assertEqual(len(self.app['accesscodes']['CLR-0']),1)

main/waeup.kofa/trunk/src/waeup/kofa/students/workflow.py

@@ -90 +90 @@
 
     Transition(
+        transition_id = 'approve_first_school_fee',
+        title = _('Approve payment'),
+        msg = _('School fee payment approved'),
+        source = CLEARED,
+        destination = PAID),
+
+    Transition(
         transition_id = 'reset5',
         title = _('Reset to cleared'),
@@ -100 +107 @@
         title = _('Pay school fee'),
         msg = _('School fee paid'),
+        source = RETURNING,
+        destination = PAID),
+
+    Transition(
+        transition_id = 'approve_school_fee',
+        title = _('Approve payment'),
+        msg = _('School fee payment approved'),
         source = RETURNING,
         destination = PAID),
@@ -193 +207 @@
     if event.transition.transition_id in UNLOCK_CLEARANCE_TRANS:
         obj.clearance_locked = False
-    # Student data don't change after first-time payment
-    if event.transition.transition_id == 'pay_first_school_fee':
-        pass
     # School fee payment of returning students triggers the change of
     # current session, current level, and current verdict
-    if event.transition.transition_id == 'pay_school_fee':
+    if event.transition.transition_id in (
+        'pay_school_fee', 'approve_school_fee'):
         getUtility(IStudentsUtils).setReturningData(obj)
     # In some tests we don't have a students container