Changeset 14688

Timestamp:

9 Jun 2017, 05:03:42 (8 years ago)

Author:

Henrik Bettermann

Message:

Add more groups for disabling student payments.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

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

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

@@ -142 +142 @@
     def _isPaymentDisabled(self, p_session, category, student):
         academic_session = self._getSessionConfiguration(p_session)
-        if category == 'schoolfee' and \
-            'sf_all' in academic_session.payment_disabled:
-            return True
+        if category == 'schoolfee':
+            if 'sf_all' in academic_session.payment_disabled:
+                return True
+            if student.current_mode == 'found' and \
+                'sf_found' in academic_session.payment_disabled:
+                return True
+            if student.is_postgrad:
+                if 'sf_pg' in academic_session.payment_disabled:
+                    return True
+                return False
+            if student.current_mode.endswith('ft') and \
+                'sf_ft' in academic_session.payment_disabled:
+                return True
+            if student.current_mode.endswith('pt') and \
+                'sf_pt' in academic_session.payment_disabled:
+                return True
+            if student.current_mode.startswith('dp') and \
+                'sf_dp' in academic_session.payment_disabled:
+                return True
+            if student.current_mode.endswith('sw') and \
+                'sf_sw' in academic_session.payment_disabled:
+                return True
         if category == 'hostel_maintenance' and \
             'maint_all' in academic_session.payment_disabled:
-            return True
-        if category == 'schoolfee' and \
-            student.current_mode == 'found' and \
-            'sf_found' in academic_session.payment_disabled:
             return True
         return False

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

@@ -106 +106 @@
     DISABLE_PAYMENT_GROUP_DICT = {
         'sf_all': 'School Fee - All Students',
+        'sf_found': 'School Fee - Foundation Students',
+        'sf_pg': 'School Fee - Postgraduate Students',
+        'sf_pt': 'School Fee - UG Part-Time Students',
+        'sf_ft': 'School Fee - UG Full-Time Students',
+        'sf_sw': 'School Fee - Sandwich Students',
+        'sf_dp': 'School Fee - Diploma Students',
         'maint_all': 'Accommodation Fee - All Students',
-        'sf_found': 'School Fee - Foundation Students',
         }