Ignore:
Timestamp:
25 Nov 2019, 11:02:44 (5 years ago)
Author:
Henrik Bettermann
Message:

Show correct buttons if payment state in ('paid', 'waived', 'scholarship').

Location:
main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/remita
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/remita/applicantsbrowser.py

    r15770 r15842  
    7272            self.context.__parent__.__parent__.year, self.context):
    7373            return ''
    74         if self.context.p_state in ('paid', 'waived'):
     74        if self.context.p_state in ('paid', 'waived', 'scholarship'):
    7575            return ''
    7676        return self.view.url(self.view.context, self.target)
    … …  
    113113            self.context.__parent__.__parent__.year, self.context):
    114114            return
    115         if self.context.p_state in ('paid', 'waived'):
     115        if self.context.p_state in ('paid', 'waived', 'scholarship'):
    116116            self.flash(_('This ticket has already been paid.'), type='danger')
    117117            return

  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/remita/studentsbrowser.py

    r15825 r15842  
    8181            self.context.student.current_session, self.context):
    8282            return ''
    83         if self.context.p_state in ('paid', 'waived'):
     83        if self.context.p_state in ('paid', 'waived', 'scholarship'):
    8484            return ''
    8585        return self.view.url(self.view.context, self.target)
    … …  
    123123            self.context.student.current_session, self.context):
    124124            return
    125         if self.context.p_state in ('paid', 'waived'):
     125        if self.context.p_state in ('paid', 'waived', 'scholarship'):
    126126            self.flash(_('This ticket has already been paid.'), type='danger')
    127127            return

  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/remita/webservices.py

    r15351 r15842  
    9696                continue
    9797            ticket = results[0]
    98             if ticket.p_state == 'waived':
     98            if ticket.p_state in ('waived', 'scholarship'):
    9999                failed += 1
    100100                continue
Note: See TracChangeset for help on using the changeset viewer.