Changeset 11653

Timestamp:

15 May 2014, 07:08:46 (11 years ago)

Author:

Henrik Bettermann

Message:

Configure all types school fees and clearance (acceptance) fees in session configuration objects.

Location:

main/waeup.aaue/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/aaue/interfaces.py (modified) (3 diffs)
• src/waeup/aaue/students/tests/test_utils.py (modified) (2 diffs)
• src/waeup/aaue/students/utils.py (modified) (2 diffs)

main/waeup.aaue/trunk/CHANGES.txt

@@ -4 +4 @@
 1.2dev (unreleased)
 ===================
+
+* Configure all types school fees and clearance (acceptance) fees in
+  session configuration objects.
 
 * Let CustomPaymentDataWebservice distinguish between old and new student

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

@@ -45 +45 @@
 
     school_fee_1 = schema.Float(
-        title = _(u'Initial School Fee (not FP)'),
+        title = _(u'Regular Initial School Fee'),
         default = 0.0,
         required = True,
@@ -51 +51 @@
 
     school_fee_2 = schema.Float(
-        title = _(u'Returning School Fee (not FP)'),
+        title = _(u'Returning School Fee'),
+        default = 0.0,
+        required = True,
+        )
+
+    school_fee_3 = schema.Float(
+        title = _(u'FP Initial School Fee'),
         default = 0.0,
         required = True,
@@ -63 +69 @@
 
     clearance_fee = schema.Float(
-        title = _(u'Acceptance Fee'),
+        title = _(u'Regular Acceptance Fee'),
+        default = 0.0,
+        required = True,
+        )
+
+    clearance_fee_fp = schema.Float(
+        title = _(u'FP Acceptance Fee'),
         default = 0.0,
         required = True,

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_utils.py

@@ -51 +51 @@
         self.app['configuration']['2004'].maint_fee = 180.0
         self.app['configuration']['2004'].clearance_fee = 1234.0
+        self.app['configuration']['2004'].clearance_fee_fp = 3456.0
         self.app['configuration']['2004'].school_fee_1 = 6666.0
         utils = getUtility(IStudentsUtils)
@@ -89 +90 @@
         self.assertEqual(payment.p_session, 2004)
         self.assertEqual(payment.amount_auth, 1234.0)
+        self.assertEqual(payment.p_item, u'CERT1')
+        self.assertEqual(error, None)
+
+        self.app['faculties']['fac1'].code = u'FP'
+        error, payment = utils.setPaymentDetails('clearance',self.student)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 3456.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)

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

@@ -140 +140 @@
             amount = academic_session.maint_fee
         elif category == 'clearance':
-            amount = academic_session.clearance_fee
+            if student.faccode == 'FP':
+                amount = academic_session.clearance_fee_fp
+            else:
+                amount = academic_session.clearance_fee
             p_item = student['studycourse'].certificate.code
         elif category == 'late_registration':
@@ -152 +155 @@
             if student.state == CLEARED:
                 if student.faccode == 'FP':
-                    amount = 84000.0
+                    amount = academic_session.school_fee_3
                 else:
                     amount = academic_session.school_fee_1