Changeset 8596

Timestamp:

2 Jun 2012, 07:24:14 (13 years ago)

Author:

Henrik Bettermann

Message:

Choose correct school fee.

Location:

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

Files:

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

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

@@ -1270 +1270 @@
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.payments_path)
+        IWorkflowState(self.student).setState('cleared')
         self.browser.getControl("Add online payment ticket").click()
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
@@ -1280 +1281 @@
         self.assertMatches('...Amount Authorized...',
                            self.browser.contents)
+        self.assertEqual(self.student['payments'][value].amount_auth, 40000.0)
         payment_url = self.browser.url
 
@@ -1455 +1457 @@
         self.assertMatches('...Amount Authorized...',
                            self.browser.contents)
-        self.assertEqual(self.student['payments'][value].amount_auth, 40000.0)
+        self.assertEqual(self.student['payments'][value].amount_auth, 20000.0)
         # Payment session and will be calculated as defined
         # in w.k.students.utils because we set changed the state

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

@@ -37 +37 @@
 from zope.formlib.form import setUpEditWidgets
 
-from waeup.kofa.interfaces import IExtFileStore, IKofaUtils, RETURNING, PAID
+from waeup.kofa.interfaces import (
+    IExtFileStore, IKofaUtils, RETURNING, PAID, CLEARED)
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.students.interfaces import IStudentsUtils
@@ -272 +273 @@
         if category == 'schoolfee':
             try:
-                amount = getattr(
-                    student['studycourse'].certificate,'school_fee_1')
-                p_item = student['studycourse'].certificate.code
+                certificate = student['studycourse'].certificate
+                p_item = certificate.code
             except (AttributeError, TypeError):
                 return _('Study course data are incomplete.'), None
-            if student.state == RETURNING:
+            if student.state == CLEARED:
+                amount = getattr(certificate, 'school_fee_1', 0.0)
+            elif student.state == RETURNING:
                 # In case of returning school fee payment the payment session
                 # and level contain the values of the session the student
                 # has paid for.
                 p_session, p_level = self.getReturningData(student)
+                amount = getattr(certificate, 'school_fee_2', 0.0)
             elif student.is_postgrad and student.state == PAID:
                 # Returning postgraduate students also pay for the next session
                 # but their level always remains the same.
                 p_session += 1
-                amount = getattr(
-                    student['studycourse'].certificate,'school_fee_2')
+                amount = getattr(certificate, 'school_fee_2', 0.0)
         elif category == 'clearance':
             p_item = student['studycourse'].certificate.code