Changeset 11644


Ignore:
Timestamp:
13 May 2014, 21:34:37 (11 years ago)
Author:
Henrik Bettermann
Message:

Use init_update and samePaymentMade methods

Location:
main/waeup.uniben/trunk/src/waeup/uniben
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.uniben/trunk/src/waeup/uniben/interswitch/browser.py

    r11633 r11644  
    5757
    5858    def update(self):
    59         student, certificate, xmldict = super(
    60             CustomInterswitchPageStudent, self).update()
     59        error = self.init_update()
     60        if error:
     61            self.flash(error, type='danger')
     62            self.redirect(self.url(self.context, '@@index'))
     63            return
     64        student = self.student
     65        xmldict = self.xmldict
    6166        # Provider data
    6267        xmldict['detail_ref'] = self.context.p_id
     
    146151
    147152    def update(self):
    148         super(CustomInterswitchPageApplicant, self).update()
     153        error = self.init_update()
     154        if error:
     155            self.flash(error, type='danger')
     156            self.redirect(self.url(self.context, '@@index'))
     157            return
    149158        xmldict = {}
    150159        provider_amt = 400.0
  • main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py

    r11479 r11644  
    203203            category = 'hostel_maintenance'
    204204        # Create ticket.
    205         for key in student['payments'].keys():
    206             ticket = student['payments'][key]
    207             if ticket.p_state == 'paid' and\
    208                ticket.p_category == category and \
    209                ticket.p_item == p_item and \
    210                ticket.p_session == p_session:
    211                   return _('This type of payment has already been made.'), None
     205        if self.samePaymentMade(student, category, p_item, p_session):
     206            return _('This type of payment has already been made.'), None
    212207        if self._isPaymentDisabled(p_session, category, student):
    213208            return _('Payment temporarily disabled.'), None
Note: See TracChangeset for help on using the changeset viewer.