Ignore:
Timestamp:
18 Jun 2012, 06:58:55 (13 years ago)
Author:
Henrik Bettermann
Message:

Merged with waeup.uniben 8740:HEAD.

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

Legend:

Unmodified
Added
Removed
  • main/waeup.futminna/trunk/src/waeup/futminna

  • main/waeup.futminna/trunk/src/waeup/futminna/interswitch/browser.py

    r8695 r8744  
    2626from waeup.kofa.interfaces import RETURNING, IKofaUtils
    2727from waeup.kofa.utils.helpers import to_timezone
    28 from waeup.kofa.students.browser import write_log_message
    2928from waeup.kofa.students.viewlets import ApprovePaymentActionButton as APABStudent
    3029from waeup.kofa.applicants.viewlets import ApprovePaymentActionButton as APABApplicant
     
    208207            return
    209208
    210         student = self.student = self.context.getStudent()
    211         certificate = getattr(self.student['studycourse'],'certificate',None)
     209        student = self.student = self.context.student
     210        certificate = getattr(student['studycourse'],'certificate',None)
    212211        self.amount_auth = 100 * self.context.amount_auth
    213212        xmldict = {}
     
    361360#            self.flash(_('This ticket has already been paid.'))
    362361#            return
    363 #        student = self.context.getStudent()
     362#        student = self.context.student
    364363#        query = self.request.form
    365364#        write_log_message(self,'callback received: %s' % query)
     
    415414            self.flash(_('This ticket has already been paid.'))
    416415            return
    417         student = self.context.getStudent()
     416        student = self.context.student
    418417        success, msg, log = query_interswitch(self.context)
    419         student.loggerInfo(ob_class, log)
     418        student.writeLogMessage(self, log)
    420419        if not success:
    421420            self.flash(msg)
     
    423422        success, msg, log = self.context.doAfterStudentPayment()
    424423        if log is not None:
    425             student.loggerInfo(ob_class, log)
     424            student.writeLogMessage(self, log)
    426425        self.flash(msg)
    427426        return
     
    439438
    440439    def update(self):
    441         ob_class = self.__implemented__.__name__
    442440        if self.context.p_state == 'paid':
    443441            self.flash(_('This ticket has already been paid.'))
     
    445443        applicant = self.context.__parent__
    446444        success, msg, log = query_interswitch(self.context)
    447         applicant.loggerInfo(ob_class, log)
     445        applicant.writeLogMessage(self, log)
    448446        if not success:
    449447            self.flash(msg)
     
    451449        success, msg, log = self.context.doAfterApplicantPayment()
    452450        if log is not None:
    453             applicant.loggerInfo(ob_class, log)
     451            applicant.writeLogMessage(self, log)
    454452        self.flash(msg)
    455453        return
Note: See TracChangeset for help on using the changeset viewer.