Changeset 9153 for main

Timestamp:

4 Sep 2012, 07:07:13 (12 years ago)

Author:

Henrik Bettermann

Message:

Prepare for previous session payments.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene/students

Files:

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

main/waeup.fceokene/trunk/src/waeup/fceokene/students/interfaces.py

@@ -71 +71 @@
     """
 
+    p_current = schema.Bool(
+        title = _(u'Current Session Payment'),
+        default = True,
+        required = False,
+        )
+
     p_level = schema.Int(
         title = _(u'Payment Level'),

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

@@ -243 +243 @@
         self.assertEqual(payment.p_item, u'')
         self.assertEqual(error, None)
+
+        error, payment = utils.setPaymentDetails('schoolfee',self.student, 2004, 100)
+        self.assertEqual(error, u'Previous session payment not yet implemented.')
         return

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

@@ -49 +49 @@
         return new_session, new_level
 
-    def setPaymentDetails(self, category, student):
+    def setPaymentDetails(self, category, student,
+            previous_session=None, previous_level=None):
         """Create Payment object and set the payment data of a student for
         the payment category specified.
@@ -58 +59 @@
         amount = 0.0
         error = u''
+        if previous_session:
+            return _('Previous session payment not yet implemented.'), None
         p_session = student['studycourse'].current_session
         p_level = student['studycourse'].current_level
+        p_current = True
         session = str(p_session)
         try:
@@ -207 +211 @@
         payment.p_session = p_session
         payment.p_level = p_level
+        payment.p_current = p_current
         payment.amount_auth = float(amount)
         return None, payment