Changeset 13123 for main

Timestamp:

1 Jul 2015, 16:22:31 (9 years ago)

Author:

Henrik Bettermann

Message:

Do not create special application payment tickets with zero amount.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/applicants/browser.py (modified) (1 diff)
• src/waeup/kofa/applicants/tests/test_browser.py (modified) (2 diffs)
• src/waeup/kofa/applicants/utils.py (modified) (3 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.3.2.dev0 (unreleased)
 =======================
+
+* Do not create special application payment tickets with Zero amount.
 
 * Remove manual clearance lock. Replace `clearance_locked` field by

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

@@ -652 +652 @@
             container, payment, self.context)
         if failure is not None:
-            self.flash(failure[0], type='danger')
+            self.flash(failure, type='danger')
             self.redirect(self.url(self.context))
             return

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

@@ -973 +973 @@
             applicant.application_number]).setPassword('apwd')
         # Add session configuration object
-        configuration = SessionConfiguration()
-        configuration.academic_session = session_1
-        configuration.transcript_fee = 200.0
-        configuration.clearance_fee = 300.0
-        self.app['configuration'].addSessionConfiguration(configuration)
+        self.configuration = SessionConfiguration()
+        self.configuration.academic_session = session_1
+        #self.configuration.transcript_fee = 200.0
+        self.configuration.clearance_fee = 300.0
+        self.app['configuration'].addSessionConfiguration(self.configuration)
 
 
@@ -996 +996 @@
             'transcript']
         self.browser.getControl(name="form.date_of_birth").value = '09/09/1988'
-        #self.browser.getControl(name="form.sex").value = ['m']
         self.browser.getControl(name="form.email").value = 'xx@yy.zz'
-        self.browser.getControl("Save").click()
+        self.configuration.transcript_fee = 0.0
+        self.browser.getControl("Save").click()
+        self.browser.getControl("Add online payment ticket").click()
+        self.assertMatches('...Amount could not be determined...',
+                           self.browser.contents)
+        self.configuration.transcript_fee = 200.0
+        self.browser.getLink("Edit application record").click()
         self.browser.getControl("Add online payment ticket").click()
         self.assertMatches('...Payment ticket created...',

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

@@ -51 +51 @@
             session_config = grok.getSite()['configuration'][session]
         except KeyError:
-            return _(u'Session configuration object is not available.'), None
+            return _(u'Session configuration object is not available.')
         payment.p_id = "p%s" % timestamp
         payment.p_item = container.title
@@ -59 +59 @@
             if applicant.special_application:
                 fee_name = applicant.special_application + '_fee'
-                payment.amount_auth = getattr(session_config, fee_name, 0.0)
+                payment.amount_auth = getattr(session_config, fee_name, None)
+                if payment.amount_auth in (0.0, None):
+                    return _('Amount could not be determined.')
                 payment.p_category = applicant.special_application
             return
@@ -69 +71 @@
         payment.amount_auth = session_config.application_fee
         if payment.amount_auth in (0.0, None):
-            return _('Amount could not be determined.'), None
+            return _('Amount could not be determined.')
         return