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

Legend:

Unmodified
Added
Removed
  • main/waeup.aaue/trunk/src/waeup/aaue/etranzact/browser.py

    r13401 r13420  
    311311    def update(self):
    312312        super(EtranzactEnterPinPageStudent, self).update()
    313         if self.context.p_category != 'schoolfee':
     313        if not self.context.p_category.startswith('schoolfee'):
    314314            return
    315315        student = self.context.student
     
    320320        for ticket in student['payments'].values():
    321321            if ticket.p_state == 'paid' and \
    322                 ticket.p_category == 'clearance':
     322                ticket.p_category.startswith('clearance'):
    323323                return
    324324        self.flash(_('Please pay acceptance fee first.'), type="danger")
  • main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py

    r13413 r13420  
    4848
    4949    SELECTABLE_PAYMENT_CATEGORIES = {
    50         'schoolfee': 'School Fee without additional fees',
     50        #'schoolfee': 'School Fee without additional fees',
    5151        #'schoolfee_1': 'School Fee 1st instalment',
    5252        #'schoolfee_2': 'School Fee 2nd instalment',
    5353        'schoolfee_incl': 'School Fee + Students\' Union Dues + Welfare Assurance Fee',
    54         'clearance': 'Acceptance Fee without additional fees',
     54        #'clearance': 'Acceptance Fee without additional fees',
    5555        'clearance_incl': 'Acceptance Fee + Matric Gown Fee + Lapel/File Fee',
    5656        'hostel_maintenance': 'Hostel Maintenance Fee',
     
    6060        'transcript': 'Transcript Fee',
    6161        'late_registration': 'Late Course Registration Fee',
    62         'welfare': 'Student Welfare Assurance Fee',
    63         'union': 'Students\' Union Dues',
    64         'lapel': 'Lapel/File Fee',
    65         'matric_gown': 'Matriculation Gown Fee',
     62        #'welfare': 'Student Welfare Assurance Fee',
     63        #'union': 'Students\' Union Dues',
     64        #'lapel': 'Lapel/File Fee',
     65        #'matric_gown': 'Matriculation Gown Fee',
    6666        'concessional': 'Concessional Fee',
    6767        }
Note: See TracChangeset for help on using the changeset viewer.