Changeset 11580 for main/waeup.kofa/trunk/src/waeup

Timestamp:

4 Apr 2014, 08:37:59 (11 years ago)

Author:

Henrik Bettermann

Message:

Show correct flash message color after payment.

Location:

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

Files:

• applicants/browser.py (modified) (2 diffs)
• applicants/payment.py (modified) (3 diffs)
• students/browser.py (modified) (2 diffs)
• students/payments.py (modified) (3 diffs)

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

@@ -684 +684 @@
 
     def update(self):
-        msg, log = self.context.approveApplicantPayment()
+        flashtype, msg, log = self.context.approveApplicantPayment()
         if log is not None:
             applicant = self.context.__parent__
@@ -695 +695 @@
                 self.context.p_id, self.context.p_category,
                 self.context.amount_auth, self.context.r_code))
-        self.flash(msg, type='warning')
+        self.flash(msg, type=flashtype)
         return
 

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

@@ -50 +50 @@
             except InvalidTransitionError:
                 msg = log = 'Error: %s' % sys.exc_info()[1]
-                return msg, log
+                return 'danger', msg, log
         log = 'payment approved: %s' % self.p_id
         msg = _('Payment approved')
-        return msg, log
+        flashtype = 'success'
+        return flashtype, msg, log
 
     def doAfterApplicantPayment(self):
@@ -64 +65 @@
             except InvalidTransitionError:
                 msg = log = 'Error: %s' % sys.exc_info()[1]
-                return msg, log
+                return 'danger', msg, log
         log = 'successful payment: %s' % self.p_id
         msg = _('Successful payment')
-        return msg, log
+        flashtype = 'success'
+        return flashtype, msg, log
 
     def approveApplicantPayment(self):
@@ -73 +75 @@
         """
         if self.p_state == 'paid':
-            return _('This ticket has already been paid.'), None
+            return 'warning', _('This ticket has already been paid.'), None
         self.approve()
         return self.doAfterApplicantPaymentApproval()

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

@@ -1856 +1856 @@
 
     def update(self):
-        msg, log = self.context.approveStudentPayment()
+        flashtype, msg, log = self.context.approveStudentPayment()
         if log is not None:
             # Add log message to students.log
@@ -1866 +1866 @@
                 self.context.p_id, self.context.p_category,
                 self.context.amount_auth, self.context.r_code))
-        self.flash(msg)
+        self.flash(msg, type=flashtype)
         return
 

main/waeup.kofa/trunk/src/waeup/kofa/students/payments.py

@@ -107 +107 @@
             error = self._createActivationCodes()
             if error is not None:
-                return error, error
+                return 'danger', error, error
         log = 'successful %s payment: %s' % (self.p_category, self.p_id)
         msg = _('Successful payment')
-        return msg, log
+        flashtype = 'success'
+        return flashtype, msg, log
 
     def doAfterStudentPaymentApproval(self):
@@ -118 +119 @@
             error = self._createActivationCodes()
             if error is not None:
-                return error, error
+                return 'danger', error, error
         log = '%s payment approved: %s' % (self.p_category, self.p_id)
         msg = _('Payment approved')
-        return msg, log
+        flashtype = 'success'
+        return flashtype, msg, log
 
     def approveStudentPayment(self):
@@ -127 +129 @@
         """
         if self.p_state == 'paid':
-            return _('This ticket has already been paid.'), None
+            return 'warning', _('This ticket has already been paid.'), None
         self.approve()
         return self.doAfterStudentPaymentApproval()