Changeset 16891 for main

Timestamp:

16 Mar 2022, 21:17:42 (3 years ago)

Author:

Henrik Bettermann

Message:

Make third_semester payment conditional on number registered at p_level.

Location:

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

Files:

• students/utils.py (modified) (2 diffs)
• 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.startswith('third_semester') and student.current_mode == 'nce_ft' \
+        elif category == '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):
@@ -135 +135 @@
                 amount = 7938.0
             no_additional_courses = 0
-            if len(category.split('_')) == 3:
-                no_additional_courses = int(category.split('_')[2])
+            courses_level = student['studycourse'].get(str(p_level))
+            if courses_level and len(courses_level)> 6:
+                no_additional_courses = len(courses_level)-6
                 amount += 2000.0 * no_additional_courses
         elif category.startswith('schoolfee'):

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 (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)',
+        'third_semester': 'NCE Third Semester Fee (fee depends on the number of courses registered)',
         }