Changeset 13794

Timestamp:

2 Apr 2016, 16:05:32 (9 years ago)

Author:

Henrik Bettermann

Message:

Allow to disable regular students acceptance fee payments. Not yet tested!

Location:

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

Files:

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

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

@@ -128 +128 @@
     def _isPaymentDisabled(self, p_session, category, student):
         academic_session = self._getSessionConfiguration(p_session)
-        if category == 'schoolfee' and \
+        if category.startswith('schoolfee') and \
             'sf_all' in academic_session.payment_disabled:
+            return True
+        if category.startswith('clearance') and \
+            'cl_regular' in academic_session.payment_disabled and \
+            student.current_mode in ('ug_ft', 'de_ft', 'mug_ft', 'mde_ft'):
             return True
         if category == 'hostel_maintenance' and \

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

@@ -150 +150 @@
         'sf_all': 'School Fee - All Students',
         'maint_all': 'Accommodation Fee - All Students',
+        'cl_regular': 'Acceptance Fee - Regular Students',
         }