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

Timestamp:

8 Jul 2022, 06:11:37 (2 years ago)

Author:

Henrik Bettermann

Message:

Do not require session configuration object for application payments.

Location:

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

Files:

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

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

@@ -979 +979 @@
         self.browser.open(self.edit_path)
         self.browser.getControl("Add online payment ticket").click()
-        # Session object missing
-        self.assertTrue(
-            'Session configuration object is not available'
-            in self.browser.contents)
-        configuration = SessionConfiguration()
-        configuration.academic_session = session_1
-        self.app['configuration'].addSessionConfiguration(configuration)
         self.browser.open(self.edit_path)
         self.browser.getControl("Add online payment ticket").click()
@@ -1125 +1118 @@
         self.app['configuration'].addSessionConfiguration(self.configuration)
 
-
     def test_pay_special_fee(self):
         self.prepare_special_container()

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

@@ -62 +62 @@
         """
         timestamp = ("%d" % int(time()*10000))[1:]
-        if container.year:
-            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
@@ -77 +71 @@
         if applicant.special:
             if applicant.special_application:
+                try:
+                    session_config = grok.getSite()['configuration'][
+                        str(payment.p_session)]
+                except KeyError:
+                    return _(u'Session configuration object is not available.')   
                 fee_name = applicant.special_application + '_fee'
                 payment.amount_auth = getattr(session_config, fee_name, None)