Changeset 8245 for main/waeup.kofa/trunk/src/waeup/kofa/applicants

Timestamp:

22 Apr 2012, 12:46:17 (13 years ago)

Author:

Henrik Bettermann

Message:

More preparations for a solid payment system customization.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• interfaces.py (modified) (2 diffs)

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

@@ -450 +450 @@
     factory = u'waeup.ApplicantOnlinePayment'
 
+    def _fillCustomFields(self, payment, session_config):
+        """No custom fields in the base package
+        """
+        pass
+
     def update(self):
         p_category = 'acceptance'
         session = str(self.context.__parent__.year)
         try:
-            academic_session = grok.getSite()['configuration'][session]
+            session_config = grok.getSite()['configuration'][session]
         except KeyError:
             self.flash(_('Session configuration object is not available.'))
@@ -469 +474 @@
         payment.p_id = "p%s" % timestamp
         payment.p_item = self.context.__parent__.title
-        payment.p_year = self.context.__parent__.year
+        payment.p_session = self.context.__parent__.year
         payment.p_category = p_category
-        payment.amount_auth = academic_session.acceptance_fee
-        #payment.surcharge_1 = academic_session.surcharge_1
-        #payment.surcharge_2 = academic_session.surcharge_2
-        #payment.surcharge_3 = academic_session.surcharge_3
+        payment.amount_auth = session_config.acceptance_fee
+        payment = self._fillCustomFields(payment, session_config)
         self.context[payment.p_id] = payment
         self.flash(_('Payment ticket created.'))

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

@@ -29 +29 @@
 from waeup.kofa.schema import TextLineChoice, FormattedDate
 from waeup.kofa.interfaces import (
-    IKofaObject, year_range, validate_email, academic_sessions_vocab,
+    IKofaObject, year_range, validate_email,
     SimpleKofaVocabulary)
 from waeup.kofa.interfaces import MessageFactory as _
@@ -511 +511 @@
 
     """
-    p_year = schema.Choice(
-        title = _(u'Payment Session'),
-        source = academic_sessions_vocab,
-        required = False,
-        )
-
-IApplicantOnlinePayment['p_year'].order = IApplicantOnlinePayment[
-    'p_year'].order
-