Changeset 8524

Timestamp:

26 May 2012, 05:42:39 (12 years ago)

Author:

Henrik Bettermann

Message:

Determine application fee and set payment attributes in ApplicantsUtility?.setPaymentDetails.

Location:

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

Files:

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

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

@@ -22 +22 @@
 import sys
 import grok
-from time import time
 from datetime import datetime, date
 from zope.event import notify
@@ -534 +533 @@
     factory = u'waeup.ApplicantOnlinePayment'
 
-    def _fillCustomFields(self, payment, session_config):
-        """No custom fields in the base package
-        """
-        return payment
-
     def update(self):
-        p_category = 'application'
-        session = str(self.context.__parent__.year)
-        try:
-            session_config = grok.getSite()['configuration'][session]
-        except KeyError:
-            self.flash(_('Session configuration object is not available.'))
-            self.redirect(self.url(self.context))
-            return
-        timestamp = "%d" % int(time()*1000)
         for key in self.context.keys():
             ticket = self.context[key]
@@ -556 +541 @@
                   self.redirect(self.url(self.context))
                   return
+        applicants_utils = getUtility(IApplicantsUtils)
+        container = self.context.__parent__
         payment = createObject(self.factory)
-        payment.p_id = "p%s" % timestamp
-        payment.p_item = self.context.__parent__.title
-        payment.p_session = self.context.__parent__.year
-        payment.p_category = p_category
-        payment.amount_auth = session_config.application_fee
-        payment = self._fillCustomFields(payment, session_config)
+        error = applicants_utils.setPaymentDetails(container, payment)
+        if error is not None:
+            self.flash(error)
+            self.redirect(self.url(self.context))
+            return
         self.context[payment.p_id] = payment
         self.flash(_('Payment ticket created.'))

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

@@ -87 +87 @@
         applicantscontainer.prefix = 'app'
         applicantscontainer.year = 2009
+        applicantscontainer.title = u'This is the app2009 container'
         applicantscontainer.application_category = 'basic'
         applicantscontainer.mode = 'create'
@@ -692 +693 @@
                            self.browser.contents)
         payment_url = self.browser.url
+        payment_id = self.applicant.keys()[0]
+        payment = self.applicant[payment_id]
+        self.assertEqual(payment.p_item,'This is the app2009 container')
+        self.assertEqual(payment.p_session,2009)
+        self.assertEqual(payment.p_category,'application')
+        self.assertEqual(payment.amount_auth,200.0)
         # The pdf payment slip can't yet be opened
         #self.browser.open(payment_url + '/payment_receipt.pdf')
@@ -701 +708 @@
             Unauthorized, self.browser.open, payment_url + '/approve')
         # We approve the payment by bypassing the view
-        payment_id = self.applicant.keys()[0]
-        payment = self.applicant[payment_id]
         payment.approve()
         # The payment slip can be downloaded now

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

@@ -19 +19 @@
 """
 
+from time import time
 import grok
 from waeup.kofa.applicants.interfaces import IApplicantsUtils
@@ -36 +37 @@
       'form.screening_score': _(u'Process Data'),
       }
+
+    def setPaymentDetails(self, container, payment):
+        """Set the payment data of an applicant.
+        """
+        timestamp = "%d" % int(time()*1000)
+        session = str(container.year)
+        try:
+            session_config = grok.getSite()['configuration'][session]
+        except KeyError:
+            return _(u'Session configuration object is not available.')
+        payment.p_id = "p%s" % timestamp
+        payment.p_item = container.title
+        payment.p_session = container.year
+        payment.p_category = 'application'
+        payment.amount_auth = session_config.application_fee
+        return None

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

@@ -253 +253 @@
 
     def getPaymentDetails(self, category, student):
-        """Get the payment dates of a student for the payment category
+        """Get the payment data of a student for the payment category
         specified.
         """