Changeset 16887

Timestamp:

15 Mar 2022, 22:05:44 (3 years ago)

Author:

Henrik Bettermann

Message:

Add more third semester payment categories.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene

Files:

• students/utils.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

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

@@ -126 +126 @@
             if student.state not in (ADMITTED, CLEARANCE, REQUESTED, CLEARED):
                 return _(u'Acceptance Fee payments not allowed.'), None
-        elif category == 'third_semester' and student.current_mode == 'nce_ft' \
+        elif category.startswith('third_semester') and student.current_mode == 'nce_ft' \
             and p_level in (300, 310, 320, 400, 410, 420):
             if not self._nce3PaymentMade(student, p_level):
                 return _(u'Make NCE 3 school fee payment first.'), None
             if student.depcode in ARTS:
-                amount = 7688
+                amount = 7688.0
             else:
-                amount = 7938
+                amount = 7938.0
+            no_additional_courses = 0
+            if len(category.split('_')) == 3:
+                no_additional_courses = int(category.split('_')[2])
+                amount += 2000.0 * no_additional_courses
         elif category.startswith('schoolfee'):
             if category == 'schoolfee_pde1':

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

@@ -92 +92 @@
         'hostel_maintenance': 'Hostel Maintenance Fee',
         'application': 'Application Fee',
-        'third_semester': 'NCE Third Semester Fee',
+        'third_semester': 'NCE Third Semester Fee (06 courses max.)',
+        'third_semester_1': 'NCE Third Semester Fee (07 courses)',
+        'third_semester_2': 'NCE Third Semester Fee (08 courses)',
+        'third_semester_3': 'NCE Third Semester Fee (09 courses)',
+        'third_semester_4': 'NCE Third Semester Fee (10 courses)',
+        'third_semester_5': 'NCE Third Semester Fee (11 courses)',
+        'third_semester_6': 'NCE Third Semester Fee (12 courses)',
         }