Changeset 16887 for main/waeup.fceokene


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.fceokene/trunk/src/waeup/fceokene/students/utils.py

    r16554 r16887  
    126126            if student.state not in (ADMITTED, CLEARANCE, REQUESTED, CLEARED):
    127127                return _(u'Acceptance Fee payments not allowed.'), None
    128         elif category == 'third_semester' and student.current_mode == 'nce_ft' \
     128        elif category.startswith('third_semester') and student.current_mode == 'nce_ft' \
    129129            and p_level in (300, 310, 320, 400, 410, 420):
    130130            if not self._nce3PaymentMade(student, p_level):
    131131                return _(u'Make NCE 3 school fee payment first.'), None
    132132            if student.depcode in ARTS:
    133                 amount = 7688
     133                amount = 7688.0
    134134            else:
    135                 amount = 7938
     135                amount = 7938.0
     136            no_additional_courses = 0
     137            if len(category.split('_')) == 3:
     138                no_additional_courses = int(category.split('_')[2])
     139                amount += 2000.0 * no_additional_courses
    136140        elif category.startswith('schoolfee'):
    137141            if category == 'schoolfee_pde1':
  • main/waeup.fceokene/trunk/src/waeup/fceokene/utils/utils.py

    r16868 r16887  
    9292        'hostel_maintenance': 'Hostel Maintenance Fee',
    9393        'application': 'Application Fee',
    94         'third_semester': 'NCE Third Semester Fee',
     94        'third_semester': 'NCE Third Semester Fee (06 courses max.)',
     95        'third_semester_1': 'NCE Third Semester Fee (07 courses)',
     96        'third_semester_2': 'NCE Third Semester Fee (08 courses)',
     97        'third_semester_3': 'NCE Third Semester Fee (09 courses)',
     98        'third_semester_4': 'NCE Third Semester Fee (10 courses)',
     99        'third_semester_5': 'NCE Third Semester Fee (11 courses)',
     100        'third_semester_6': 'NCE Third Semester Fee (12 courses)',
    95101        }
    96102
Note: See TracChangeset for help on using the changeset viewer.