Changeset 13420

Timestamp:

9 Nov 2015, 14:11:21 (9 years ago)

Author:

Henrik Bettermann

Message:

Students must not select regular school fee and clearance fee payments.
Fix EtranzactEnterPinPageStudent?.

Location:

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

Files:

• etranzact/browser.py (modified) (2 diffs)
• utils/utils.py (modified) (2 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/etranzact/browser.py

@@ -311 +311 @@
     def update(self):
         super(EtranzactEnterPinPageStudent, self).update()
-        if self.context.p_category != 'schoolfee':
+        if not self.context.p_category.startswith('schoolfee'):
             return
         student = self.context.student
@@ -320 +320 @@
         for ticket in student['payments'].values():
             if ticket.p_state == 'paid' and \
-                ticket.p_category == 'clearance':
+                ticket.p_category.startswith('clearance'):
                 return
         self.flash(_('Please pay acceptance fee first.'), type="danger")

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

@@ -48 +48 @@
 
     SELECTABLE_PAYMENT_CATEGORIES = {
-        'schoolfee': 'School Fee without additional fees',
+        #'schoolfee': 'School Fee without additional fees',
         #'schoolfee_1': 'School Fee 1st instalment',
         #'schoolfee_2': 'School Fee 2nd instalment',
         'schoolfee_incl': 'School Fee + Students\' Union Dues + Welfare Assurance Fee',
-        'clearance': 'Acceptance Fee without additional fees',
+        #'clearance': 'Acceptance Fee without additional fees',
         'clearance_incl': 'Acceptance Fee + Matric Gown Fee + Lapel/File Fee',
         'hostel_maintenance': 'Hostel Maintenance Fee',
@@ -60 +60 @@
         'transcript': 'Transcript Fee',
         'late_registration': 'Late Course Registration Fee',
-        'welfare': 'Student Welfare Assurance Fee',
-        'union': 'Students\' Union Dues',
-        'lapel': 'Lapel/File Fee',
-        'matric_gown': 'Matriculation Gown Fee',
+        #'welfare': 'Student Welfare Assurance Fee',
+        #'union': 'Students\' Union Dues',
+        #'lapel': 'Lapel/File Fee',
+        #'matric_gown': 'Matriculation Gown Fee',
         'concessional': 'Concessional Fee',
         }