Changeset 8428 for main/waeup.kofa/trunk/src/waeup/kofa/applicants

Timestamp:

12 May 2012, 07:01:04 (13 years ago)

Author:

Henrik Bettermann

Message:

Payment methods do now all return a success flag, a flash message string and a log string. All these adjustments are necessary for waeup.uniben.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/applicants

Files:

• browser.py (modified) (1 diff)
• payment.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -599 +599 @@
 
     def update(self):
-        success, msg = self.context.approveApplicantPayment()
-        if success:
+        success, msg, log = self.context.approveApplicantPayment()
+        if log is not None:
             ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
-            self.context.__parent__.loggerInfo(
-                ob_class, 'valid callback: %s' % self.context.p_id)
+            self.context.__parent__.loggerInfo(ob_class, log)
         self.flash(msg)
         return

main/waeup.kofa/trunk/src/waeup/kofa/applicants/payment.py

@@ -45 +45 @@
             wf_info.fireTransition('pay')
         except InvalidTransitionError:
-            return False, 'Error: %s' % sys.exc_info()[1]
-        return True, _('Valid callback received.')
+            msg = log = 'Error: %s' % sys.exc_info()[1]
+            return False, msg, log
+        log = 'successful payment: %s' % self.p_id
+        msg = _('Successful payment')
+        return False, msg, log
 
     def approveApplicantPayment(self):
@@ -52 +55 @@
         """
         if self.p_state == 'paid':
-            return False, _('This ticket has already been paid.')
+            return False, _('This ticket has already been paid.'), None
         self.approve()
         return self.doAfterApplicantPayment()