Changeset 8260

Timestamp:

24 Apr 2012, 10:30:14 (13 years ago)

Author:

Henrik Bettermann

Message:

Rename Acceptance Fee -> Application Fee

Location:

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

Files:

• applicants/browser.py (modified) (3 diffs)
• applicants/payment.py (modified) (1 diff)
• applicants/tests/test_browser.py (modified) (2 diffs)
• applicants/workflow.py (modified) (1 diff)
• interfaces.py (modified) (2 diffs)
• payments/interfaces.py (modified) (1 diff)

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

@@ -442 +442 @@
         return
 
-class AcceptanceFeePaymentAddPage(UtilityView, grok.View):
+class ApplicationFeePaymentAddPage(UtilityView, grok.View):
     """ Page to add an online payment ticket
     """
@@ -456 +456 @@
 
     def update(self):
-        p_category = 'acceptance'
+        p_category = 'application'
         session = str(self.context.__parent__.year)
         try:
@@ -476 +476 @@
         payment.p_session = self.context.__parent__.year
         payment.p_category = p_category
-        payment.amount_auth = session_config.acceptance_fee
+        payment.amount_auth = session_config.application_fee
         payment = self._fillCustomFields(payment, session_config)
         self.context[payment.p_id] = payment

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

@@ -17 +17 @@
 ##
 """
-Acceptance fee payment.
+Application fee payment.
 """
 import grok

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

@@ -595 +595 @@
         return
 
-    def test_pay_acceptance_fee(self):
+    def test_pay_application_fee(self):
         self.login()
         self.browser.open(self.edit_path)
@@ -613 +613 @@
         configuration = SessionConfiguration()
         configuration.academic_session = 2009
-        configuration.acceptance_fee = 200.0
+        configuration.application_fee = 200.0
         self.app['configuration'].addSessionConfiguration(configuration)
         self.browser.open(self.edit_path)

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

@@ -62 +62 @@
     Transition(
         transition_id = 'pay',
-        title = _('Pay acceptance fee'),
+        title = _('Pay application fee'),
         msg = _('Fee paid'),
         source = STARTED,

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

@@ -576 +576 @@
         )
 
+    application_fee = schema.Float(
+        title = _(u'Application Fee'),
+        default = 0.0,
+        required = False,
+        )
+
     clearance_fee = schema.Float(
         title = _(u'Clearance Fee'),
@@ -583 +589 @@
 
     booking_fee = schema.Float(
-        title = _(u'Booking Fee'),
-        default = 0.0,
-        required = False,
-        )
-
-    acceptance_fee = schema.Float(
-        title = _(u'Acceptance Fee'),
+        title = _(u'Bed Booking Fee'),
         default = 0.0,
         required = False,

main/waeup.kofa/trunk/src/waeup/kofa/payments/interfaces.py

@@ -35 +35 @@
     (_('Transfer'),'transfer'),
     (_('Gown'),'gown'),
-    (_('Acceptance Fee'), 'acceptance'),
+    (_('Application Fee'), 'application'),
     )