Changeset 15745 for main/waeup.aaue/trunk/src/waeup

Timestamp:

3 Nov 2019, 08:39:29 (5 years ago)

Author:

Henrik Bettermann

Message:

Add ICT Fee.

Location:

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

Files:

• interfaces.py (modified) (1 diff)
• students/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (2 diffs)

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

@@ -260 +260 @@
         )
 
+    ict_fee = schema.Float(
+        title = _(u'ICT Fee'),
+        default = 0.0,
+        required = True,
+        )
+
     coursereg_deadline = schema.Datetime(
         title = _(u'FT Course Reg. Deadline'),

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

@@ -455 +455 @@
                     and student.state == CLEARED:
                     amount += gateway_net_amt(academic_session.id_card_fee)
-                if student.entry_session >= 2019:
-                    amount += gateway_net_amt(academic_session.ict_fee)
             # Add session specific penalty fees
             if student.is_postgrad:
@@ -472 +470 @@
             elif student.depcode == 'VAT':
                 amount = 5000.0
+            if student.entry_session >= 2019:
+                amount += gateway_net_amt(academic_session.ict_fee)
         elif not student.is_postgrad:
             fee_name = category + '_fee'

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

@@ -65 +65 @@
         'gst_registration_2': 'Registration Fee GST222',
         'ent_registration_1': 'Registration Fee ENT201',
-        'fac_dep': 'Faculty and Departmental Dues',
+        'fac_dep': 'Faculty and Departmental Dues (incl. ICT Fee)',
         'restitution': 'Restitution Fee',
         }
@@ -97 +97 @@
         'gst_registration_2': 'Registration Fee GST222',
         'ent_registration_1': 'Registration Fee ENT201',
-        'fac_dep': 'Faculty and Departmental Dues',
+        'fac_dep': 'Faculty and Departmental Dues (incl. ICT Fee)',
         'restitution': 'Restitution Fee',
         }