Changeset 13374

Timestamp:

1 Nov 2015, 14:11:52 (9 years ago)

Author:

Henrik Bettermann

Message:

Configure new payment categories. School fee amounts are now set via certificates not session configuration objects.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

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

main/waeup.aaue/trunk/src/waeup/aaue/etranzact/tests.py

@@ -52 +52 @@
         # Managers can add online payment tickets
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.app['configuration']['2004'].school_fee_1 = 1234.0
+        self.student['studycourse'].certificate.school_fee_1 = 1234.0
         self.browser.open(self.payments_path)
         IWorkflowState(self.student).setState('cleared')
+        self.student.nationality = u'NG'
         self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(name="form.p_category").value = ['clearance']

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

@@ -29 +29 @@
     """A session configuration object.
     """
-
-    # Base fees, do not remove.
-
-    #school_fee_base = schema.Float(
-    #    title = _(u'School Fee Instalments'),
-    #    default = 0.0,
-    #    required = True,
-    #    )
-
-    #school_fee = schema.Float(
-    #    title = _(u'School Fee (not FP)'),
-    #    default = 0.0,
-    #    required = True,
-    #    )
-
-    school_fee_1 = schema.Float(
-        title = _(u'Regular Initial School Fee'),
-        default = 0.0,
-        required = True,
-        )
-
-    school_fee_2 = schema.Float(
-        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,
-        )
 
     application_fee = schema.Float(
@@ -130 +98 @@
         )
 
+    welfare_fee = schema.Float(
+        title = _(u'AAU Student Welfare Assurance Fee'),
+        default = 0.0,
+        required = True,
+        )
+
+    union_fee = schema.Float(
+        title = _(u'Students\' Union Due'),
+        default = 0.0,
+        required = True,
+        )
+
+    lapel_fee = schema.Float(
+        title = _(u'AAU Lapel/File Fee'),
+        default = 0.0,
+        required = True,
+        )
+
+    matric_gown_fee = schema.Float(
+        title = _(u'Matriculation Gown Fee'),
+        default = 0.0,
+        required = True,
+        )
+
+    concessional_fee = schema.Float(
+        title = _(u'Concessional Fee'),
+        default = 0.0,
+        required = True,
+        )
+
+    medical_fee = schema.Float(
+        title = _(u'Medical Student Acceptance Fee'),
+        default = 0.0,
+        required = True,
+        )
+
     coursereg_deadline = schema.Datetime(
         title = _(u'Course Reg. Deadline'),

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

@@ -111 +111 @@
     def test_interswitch_form_school_fees(self):
         self.student['studycourse'].entry_session = 2013
-        self.app['configuration']['2004'].school_fee_1 = 51750.0
+        self.student['studycourse'].certificate.school_fee_1 = 51750.0
         # Manager can access InterswitchForm
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')

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

@@ -124 +124 @@
         self.assertMatches('...Amount could not be determined...',
                            self.browser.contents)
-        self.app['configuration']['2004'].school_fee_1 = 6666.0
         #self.browser.getControl(name="form.p_category").value = ['schoolfee']
         # Accepotance fee must be paid first
@@ -136 +135 @@
         cpt_value = ctrl.options[0]
         # School fee payment ticket can be added ...
+        self.student['studycourse'].certificate.school_fee_1 = 6666.0
+        self.student.nationality = u'NG'
         self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
@@ -235 +236 @@
 
     def test_manage_payments_bypass_ac_creation(self):
-        self.app['configuration']['2004'].school_fee_1 = 6666.0
+        self.student['studycourse'].certificate.school_fee_1 = 6666.0
+        self.student.nationality = u'NG'
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.payments_path)

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

@@ -52 +52 @@
         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
+        self.student['studycourse'].certificate.school_fee_1 = 6666.0
+        self.student['studycourse'].certificate.school_fee_2 = 7777.0
+        self.student.nationality = u'NG'
         utils = getUtility(IStudentsUtils)
 
@@ -58 +60 @@
         configuration.academic_session = 2005
         self.app['configuration'].addSessionConfiguration(configuration)
-        self.app['configuration']['2005'].school_fee_2 = 7777.0
 
         error, payment = utils.setPaymentDetails('schoolfee',self.student)

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

@@ -121 +121 @@
         elif category == 'hostel_maintenance':
             amount = academic_session.maint_fee
+        elif category == 'welfare':
+            amount = academic_session.welfare_fee
+        elif category == 'union':
+            amount = academic_session.union_fee
+        elif category == 'lapel':
+            amount = academic_session.lapel_fee
+        elif category == 'matric_gown':
+            amount = academic_session.matric_gown_fee
+        elif category == 'concessional':
+            amount = academic_session.concession_fee
+        elif category == 'medical':
+            amount = academic_session.medical_fee
         elif category == 'clearance':
             if student.faccode == 'FP':
@@ -136 +148 @@
                 return _('Study course data are incomplete.'), None
             if student.state == CLEARED:
-                if student.faccode == 'FP':
-                    amount = academic_session.school_fee_3
+                if student.is_foreigner:
+                    amount = getattr(certificate, 'school_fee_3', 0.0)
                 else:
-                    amount = academic_session.school_fee_1
-            elif student.state == RETURNING or\
-                (student.is_postgrad and student.state == PAID):
-                academic_session = self._getSessionConfiguration(p_session)
-                if academic_session == None:
-                    return _(u'Session configuration object is not available.'), None
-                if student.state == RETURNING:
-                    p_session, p_level = self.getReturningData(student)
-                else:
-                    # Returning postgraduate students also pay for the 
-                    # next session but their level always remains the same.
-                    p_session += 1
+                    amount = getattr(certificate, 'school_fee_1', 0.0)
+            elif student.state == RETURNING:
+                # In case of returning school fee payment the payment session
+                # and level contain the values of the session the student
+                # has paid for.
+                p_session, p_level = self.getReturningData(student)
                 try:
                     academic_session = grok.getSite()[
@@ -156 +162 @@
                 except KeyError:
                     return _(u'Session configuration object is not available.'), None
-                amount = academic_session.school_fee_2
+                if student.is_foreigner:
+                    amount = getattr(certificate, 'school_fee_4', 0.0)
+                else:
+                    amount = getattr(certificate, 'school_fee_2', 0.0)
             else:
                 return _('Wrong state.'), None

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

@@ -39 +39 @@
         'transcript': 'Transcript Fee',
         'late_registration': 'Late Course Registration Fee',
+        'welfare': 'AAU Student Welfare Assurance Fee',
+        'union': 'Students\' Union Due',
+        'lapel': 'AAU Lapel/File Fee',
+        'matric_gown': 'Matriculation Gown Fee',
+        'concessional': 'Concessional Fee',
+        'medical': 'Medical Student Acceptance Fee',
         }
 
@@ -46 +52 @@
         #'schoolfee_2': 'School Fee 2nd instalment',
         'clearance': 'Acceptance Fee',
-        #'hostel_maintenance': 'Hostel Maintenance Fee',
+        'hostel_maintenance': 'Hostel Maintenance Fee',
         'application': 'Application Fee',
         #'gown': 'Gown Hire Fee',
@@ -53 +59 @@
         'transcript': 'Transcript Fee',
         'late_registration': 'Late Course Registration Fee',
+        'welfare': 'AAU Student Welfare Assurance Fee',
+        'union': 'Students\' Union Due',
+        'lapel': 'AAU Lapel/File Fee',
+        'matric_gown': 'Matriculation Gown Fee',
+        'concessional': 'Concessional Fee',
+        'medical': 'Medical Student Acceptance Fee',
         }