Changeset 14455

Timestamp:

25 Jan 2017, 09:26:29 (8 years ago)

Author:

Henrik Bettermann

Message:

Configure clearance fee.

Location:

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri

Files:

• interfaces.py (modified) (1 diff)
• students/tests/test_utils.py (modified) (3 diffs)
• students/utils.py (modified) (1 diff)

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/interfaces.py

@@ -38 +38 @@
         )
 
-    clearance_fee = schema.Float(
-        title = _(u'Acceptance Fee'),
+    clearance_fee_1 = schema.Float(
+        title = _(u'Acceptance Fee NCE Prog.'),
+        default = 0.0,
+        required = False,
+        )
+
+    clearance_fee_2 = schema.Float(
+        title = _(u'Acceptance Fee Degree Prog.'),
         default = 0.0,
         required = False,

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/tests/test_utils.py

@@ -25 +25 @@
         configuration.academic_session = 2016
         self.app['configuration'].addSessionConfiguration(configuration)
-        self.app['configuration']['2016'].clearance_fee = 10234.0
+        self.app['configuration']['2016'].clearance_fee_1 = 10300.0
+        self.app['configuration']['2016'].clearance_fee_2 = 20300.0
 
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
@@ -49 +50 @@
 
         error, payment = utils.setPaymentDetails('clearance',self.student)
-        self.assertEqual(payment.amount_auth, 15234.0)
+        self.assertEqual(payment.amount_auth, 25300.0)
         self.assertEqual(payment.p_item, u'CERT1')
 
@@ -56 +57 @@
         self.assertEqual(payment.amount_auth, 69500.0)
         error, payment = utils.setPaymentDetails('clearance',self.student)
-        self.assertEqual(payment.amount_auth, 10234.0)
+        self.assertEqual(payment.amount_auth, 20300.0)
+
+        self.student['studycourse'].certificate.study_mode = 'nce_ft'
+        error, payment = utils.setPaymentDetails('clearance',self.student)
+        self.assertEqual(payment.amount_auth, 10300.0)
         return

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/utils.py

@@ -106 +106 @@
             except (AttributeError, TypeError):
                 return _('Study course data are incomplete.'), None
-            amount = academic_session.clearance_fee
+            if student.current_mode == 'ug_ft':
+                amount = academic_session.clearance_fee_2
+            else:
+                amount = academic_session.clearance_fee_1
             if local_nonlocal(student) == 'non-local':
                 amount += 5000.0