Changeset 9298

Timestamp:

5 Oct 2012, 11:26:26 (12 years ago)

Author:

Henrik Bettermann

Message:

Set payment ticket attributes properly.

Location:

main/waeup.futminna/trunk/src/waeup/futminna/students

Files:

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

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

@@ -108 +108 @@
         IWorkflowState(self.student).setState('returning')
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
-        self.assertEqual(payment.p_level, 100)
-        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.p_level, 200)
+        self.assertEqual(payment.p_session, 2005)
         self.assertEqual(payment.amount_auth, 37000.0)
         self.assertEqual(payment.p_item, u'CERT1')

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

@@ -79 +79 @@
                     else:
                         amount = 74200.0
-
                 # fresh
                 elif student.state == CLEARED:
@@ -98 +97 @@
                 else:
                     amount = 0.0
+            if student.state == RETURNING:
+                p_session, p_level = self.getReturningData(student)
         elif category == 'clearance':
             try: