Changeset 13891

Timestamp:

7 Jun 2016, 20:36:04 (8 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes in base package.

Location:

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly

Files:

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

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interfaces.py

@@ -38 +38 @@
         )
 
-    application_fee = schema.Float(
-        title = _(u'Application Fee (fallback)'),
-        default = 0.0,
-        required = True,
-        )
-
     clearance_fee = schema.Float(
         title = _(u'Clearance Fee'),

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/tests/test_browser.py

@@ -483 +483 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
-        self.assertMatches('...Payment temporarily disabled...',
+        self.assertMatches('...This category of payments has been disabled...',
                            self.browser.contents)
         self.app['configuration']['2005'].payment_disabled = ['sf_non_pg']
@@ -489 +489 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
-        self.assertMatches('...Payment temporarily disabled...',
+        self.assertMatches('...This category of payments has been disabled...',
                            self.browser.contents)
         # ... but PG can pay.

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

@@ -265 +265 @@
             #category = 'schoolfee'
         if self._isPaymentDisabled(p_session, category, student):
-            return _('Payment temporarily disabled.'), None
+            return _('This category of payments has been disabled.'), None
         payment = createObject(u'waeup.StudentOnlinePayment')
         timestamp = ("%d" % int(time()*10000))[1:]