Changeset 10832 for main/waeup.kofa/trunk/src/waeup

Timestamp:

10 Dec 2013, 07:40:18 (11 years ago)

Author:

Henrik Bettermann

Message:

Reorganize setPaymentDetails. Add test.

Location:

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

Files:

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

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

@@ -758 +758 @@
             in logcontent)
 
-    def test_pay_application_fee(self):
+    def test_pay_portal_application_fee(self):
         self.login()
         self.browser.open(self.edit_path)
@@ -869 +869 @@
         return
 
+    def test_pay_container_application_fee(self):
+        self.login()
+        self.browser.open(self.edit_path)
+        self.fill_correct_values()
+        self.browser.getControl("Save").click()
+        configuration = SessionConfiguration()
+        configuration.academic_session = session_1
+        self.applicantscontainer.application_fee = 120.0
+        configuration.application_fee = 9999.9
+        self.app['configuration'].addSessionConfiguration(configuration)
+        self.browser.open(self.edit_path)
+        self.browser.getControl("Add online payment ticket").click()
+        self.assertMatches('...Payment ticket created...',
+                           self.browser.contents)
+        self.assertMatches('...Payment ticket created...',
+                           self.browser.contents)
+        self.assertFalse(
+            '<span>9999.9</span>' in self.browser.contents)
+        self.assertTrue(
+            '<span>120.0</span>' in self.browser.contents)
+        self.assertTrue(
+            '<span>Application Fee</span>' in self.browser.contents)
+        return
 
     def test_pay_special_fee(self):

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

@@ -47 +47 @@
         """
         timestamp = ("%d" % int(time()*10000))[1:]
-        container_fee = container.application_fee
-        if container_fee:
-            payment.amount_auth = container_fee
-        else:
-            session = str(container.year)
-            try:
-                session_config = grok.getSite()['configuration'][session]
-            except KeyError:
-                return _(u'Session configuration object is not available.')
-            payment.amount_auth = session_config.application_fee
-            payment.p_category = 'application'
+        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
         if container.prefix.startswith('special'):
             fee_name = applicant.special_application + '_fee'
             payment.amount_auth = getattr(session_config, fee_name, 0.0)
             payment.p_category = applicant.special_application
-        payment.p_id = "p%s" % timestamp
-        payment.p_item = container.title
-        payment.p_session = container.year
-        return None
+            return
+        payment.p_category = 'application'
+        container_fee = container.application_fee
+        if container_fee:
+            payment.amount_auth = container_fee
+            return
+        payment.amount_auth = session_config.application_fee
+        return
 
     def getApplicantsStatistics(self, container):