Changeset 6920

Timestamp:

22 Oct 2011, 05:15:30 (13 years ago)

Author:

Henrik Bettermann

Message:

Provide a getPaymentDetails function which requires a SessionConfiguration? object. This function is for demonstration and testing only.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

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

main/waeup.sirp/trunk/src/waeup/sirp/configuration.py

@@ -19 +19 @@
 import grok
 from zope.component.interfaces import IFactory
+from zope.interface import implementedBy
 from waeup.sirp.interfaces import (
     ISessionConfiguration, IConfigurationContainer, ISessionConfigurationAdd,

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

@@ -881 +881 @@
             payment.surcharge_1,
             payment.surcharge_2,
-            payment.surcharge_3)  = getPaymentDetails(
+            payment.surcharge_3,
+            error)  = getPaymentDetails(
             data['p_category'],self.context.__parent__)
-        #if payment.amount_auth == 0:
-        #    self.flash('Payment amount could not be determined.')
-        #    self.redirect(self.url(self.context, u'@@manage'))
-        #    return
+        if error:
+            self.flash(error)
+            self.redirect(self.url(self.context, u'@@manage'))
+            return
         self.context[payment.p_id] = payment
         self.flash('Payment ticket created.')

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

@@ -34 +34 @@
 from waeup.sirp.testing import FunctionalLayer, FunctionalTestCase
 from waeup.sirp.app import University
+from waeup.sirp.configuration import SessionConfiguration
 from waeup.sirp.students.student import Student
 from waeup.sirp.university.faculty import Faculty
@@ -80 +81 @@
         # to access grok.getSite() and should get our new app then
         setSite(app)
+
+        # Set up SessionConfiguration object
+        configuration = SessionConfiguration()
+        configuration.academic_session = 2004
+        configuration.fee_1 = 20000
+        self.app['configuration'].addSessionConfiguration(configuration)
 
         # Add student with subobjects

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

@@ -1 +1 @@
 """General helper functions for the student section.
 """
-
+from grok import getSite
 from random import SystemRandom as r
 from waeup.sirp.interfaces import academic_sessions_vocab
@@ -21 +21 @@
     return
 
-# To be defined in customization packages
+# To be specified in customization packages.
+# This function is for demonstration and testing only.
 def getPaymentDetails(category, student):
-    p_session = None
     surcharge_1 = surcharge_2 = surcharge_3 = 0
     p_item = u''
     amount = 0
-    return amount, p_item, p_session, surcharge_1, surcharge_2, surcharge_3
+    error = u''
+    p_session = student['studycourse'].current_session
+    session = str(p_session)
+    try:
+        academic_session = getSite()['configuration'][session]
+    except KeyError:
+        error = u'Session configuration object is not available.'
+        return (amount, p_item, p_session,
+            surcharge_1, surcharge_2, surcharge_3, error)
+    if category == 'schoolfee':
+        amount = academic_session.fee_1
+        surcharge_1 = academic_session.fee_2
+        p_item = student['studycourse'].certificate.code
+    return (amount, p_item, p_session,
+        surcharge_1, surcharge_2, surcharge_3, error)