Changeset 13887 for main/waeup.uniben/trunk/src/waeup/uniben

Timestamp:

7 Jun 2016, 20:35:15 (9 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes in base package.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

• applicants/browser.py (modified) (3 diffs)
• applicants/utils.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• interswitch/tests.py (modified) (1 diff)

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

@@ -110 +110 @@
     grok.template('applicantdisplaypage')
 
+    @property
+    def display_payments(self):
+        if self.context.special or self.target == 'ictwk':
+            return True
+        return getattr(self.context.__parent__, 'application_fee', None)
+
     def _show_pastq_putme(self):
         return self.target.startswith('putme') \
@@ -258 +264 @@
 
     @property
+    def display_payments(self):
+        if self.context.special or self.target == 'ictwk':
+            return True
+        return getattr(self.context.__parent__, 'application_fee', None)
+
+    @property
     def custom_upload_requirements(self):
         if not checkPermission('waeup.uploadPassportPictures', self.context):
@@ -287 +299 @@
     """An applicant-centered edit view for applicant data.
     """
+
+    @property
+    def display_payments(self):
+        if self.context.special or self.target == 'ictwk':
+            return True
+        return getattr(self.context.__parent__, 'application_fee', None)
 
     @property

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

@@ -100 +100 @@
             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
-        if payment.amount_auth in (0.0, None):
-            return _('Amount could not be determined.')
+            if not container_fee:
+                return _('Amount could not be determined.')
+            payment.amount_auth = container_fee
         return

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

@@ -34 +34 @@
     school_fee_base = schema.Float(
         title = _(u'School Fee (ignored)'),
-        default = 0.0,
-        required = False,
-        )
-
-    application_fee = schema.Float(
-        title = _(u'Application Fee (fallback)'),
         default = 0.0,
         required = False,

main/waeup.uniben/trunk/src/waeup/uniben/interswitch/tests.py

@@ -472 +472 @@
         configuration = CustomSessionConfiguration()
         configuration.academic_session = datetime.now().year - 2
+        self.applicantscontainer.application_fee = 1000.0
         self.app['configuration'].addSessionConfiguration(configuration)
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.manage_path)
         #IWorkflowState(self.student).setState('started')
-        self.applicantscontainer.application_fee = 1000.0
         super(InterswitchTestsApplicants, self).fill_correct_values()
         self.browser.getControl("Add online").click()