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

Timestamp:

8 Apr 2016, 05:26:51 (8 years ago)

Author:

Henrik Bettermann

Message:

Determine total registration fee.

Location:

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

Files:

• applicants/tests/test_browser.py (modified) (3 diffs)
• applicants/tests/test_image.jpg (added)
• applicants/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (1 diff)

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

@@ -30 +30 @@
 from waeup.uniben.configuration import CustomSessionConfiguration
 from waeup.kofa.applicants.tests.test_browser import ApplicantsFullSetup, PH_LEN
+
+session_1 = datetime.now().year - 2
+SAMPLE_IMAGE = os.path.join(os.path.dirname(__file__), 'test_image.jpg')
 
 class CustomApplicantUITests(ApplicantsFullSetup):
@@ -227 +230 @@
         print "Sample nils_application_slip.pdf written to %s" % path
 
-    def test_ictwk_application_slip(self):
+    def test_ictwk_application(self):
 
         # Remove required FieldProperty attribute first ...
@@ -243 +246 @@
         #self.browser.getControl(name="form.sex").value = ['m']
         self.browser.getControl(name="form.email").value = 'xx@yy.zz'
+        image = open(SAMPLE_IMAGE, 'rb')
+        ctrl = self.browser.getControl(name='form.passport')
+        file_ctrl = ctrl.mech_control
+        file_ctrl.add_file(image, filename='myphoto.jpg')
         self.browser.getControl("Save").click()
         self.applicant.registration_cats = ['group', 'corporate']
+        IWorkflowState(self.applicant).setState('started')
+        configuration = CustomSessionConfiguration()
+        configuration.academic_session = session_1
+        configuration.application_fee = 0.0
+        self.app['configuration'].addSessionConfiguration(configuration)
+        self.browser.getControl("Add online payment ticket").click()
+        self.assertMatches('...Payment ticket created...',
+                           self.browser.contents)
+        self.assertEqual(self.applicant.values()[0].amount_auth, 450000)
         IWorkflowState(self.applicant).setState('submitted')
         self.browser.open(self.view_path)

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

@@ -19 +19 @@
 """
 
+import grok
+from time import time
 from kofacustom.nigeria.applicants.utils import NigeriaApplicantsUtils
 from waeup.kofa.applicants.workflow import (INITIALIZED,
     STARTED, PAID, ADMITTED, NOT_ADMITTED, SUBMITTED, CREATED)
+from waeup.uniben.applicants.interfaces import REGISTRATION_CATS
 from waeup.uniben.interfaces import MessageFactory as _
-
-
 
 class CustomApplicantsUtils(NigeriaApplicantsUtils):
@@ -90 +91 @@
                 fee_name = applicant.special_application + '_fee'
                 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
-        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
+        elif applicant.__parent__.prefix == 'ictwk':
+            payment.p_category = 'registration'
+            for cat in applicant.registration_cats:
+                payment.amount_auth += REGISTRATION_CATS[cat][1]
+        else:
+            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.')
         return
-

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

@@ -82 +82 @@
         'admission_checking': 'Admission Checking Fee',
         'jupeb': 'JUPEB Examination Fee',
+        'registration': 'Registration Fee'
         }