Changeset 14571 for main/waeup.aaue/trunk/src

Timestamp:

22 Feb 2017, 10:59:30 (8 years ago)

Author:

Henrik Bettermann

Message:

Specify ug pt payment category.

Location:

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

Files:

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

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

@@ -483 +483 @@
                            self.browser.contents)
 
-        self.app['configuration']['2004'].payment_disabled = ['sf_pt']
+        self.app['configuration']['2004'].payment_disabled = ['sf_ug_pt']
         self.browser.getControl(name="form.p_category").value = ['schoolfee_incl']
         self.browser.getControl("Create ticket").click()

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

@@ -194 +194 @@
                 student.is_postgrad:
                 return True
-            if 'sf_pt' in academic_session.payment_disabled and \
-                student.current_mode.endswith('_pt'):
+            if 'sf_ug_pt' in academic_session.payment_disabled and \
+                student.current_mode in ('ug_pt', 'de_pt'):
                 return True
             if 'sf_found' in academic_session.payment_disabled and \

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

@@ -193 +193 @@
         'sf_all': 'School Fee - All Students',
         'sf_pg': 'School Fee - Postgraduate Students',
-        'sf_pt': 'School Fee - Part-Time Students',
+        'sf_ug_pt': 'School Fee - Undergraduate Part-Time Students',
         'sf_found': 'School Fee - Foundation Students',
         'maint_all': 'Accommodation Fee - All Students',