Changeset 8428 for main/waeup.kofa/trunk

Timestamp:

12 May 2012, 07:01:04 (12 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

Files:

• applicants/browser.py (modified) (1 diff)
• applicants/payment.py (modified) (2 diffs)
• students/browser.py (modified) (1 diff)
• students/payments.py (modified) (4 diffs)
• students/tests/test_browser.py (modified) (4 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()

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

@@ -1138 +1138 @@
 
     def update(self):
-        success, msg = self.context.approveStudentPayment()
-        if success:
-            write_log_message(self,'valid callback: %s' % self.context.p_id)
+        success, msg, log = self.context.approveStudentPayment()
+        if log is not None:
+            write_log_message(self,log)
         self.flash(msg)
         return

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

@@ -69 +69 @@
                 'CLR',0,self.amount_auth,student.student_id)
             if error:
-                return False, _('Valid callback received. ${a}',
-                    mapping = {'a':error})
+                return False, error, error
             self.ac = pin
         elif self.p_category == 'schoolfee':
@@ -77 +76 @@
                 'SFE',0,self.amount_auth,student.student_id)
             if error:
-                return False, _('Valid callback received. ${a}',
-                    mapping = {'a':error})
+                return False, error, error
             self.ac = pin
         elif self.p_category == 'bed_allocation':
@@ -85 +83 @@
                 'HOS',0,self.amount_auth,student.student_id)
             if error:
-                return False, _('Valid callback received. ${a}',
-                    mapping = {'a':error})
+                return False, error, error
             self.ac = pin
-        return True, _('Valid callback received.')
+        log = 'successful payment: %s' % self.p_id
+        msg = _('Successful payment')
+        return True, msg, log
 
     def approveStudentPayment(self):
@@ -94 +93 @@
         """
         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.doAfterStudentPayment()

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -1293 +1293 @@
         self.browser.open(payment_url)
         self.browser.getLink("Approve payment").click()
-        self.assertMatches('...Valid callback received...',
+        self.assertMatches('...Successful payment...',
                           self.browser.contents)
 
@@ -1344 +1344 @@
         self.browser.getLink(value).click()
         self.browser.open(self.browser.url + '/approve')
-        self.assertMatches('...Valid callback received...',
+        self.assertMatches('...Successful payment...',
                           self.browser.contents)
         expected = '''...
@@ -1383 +1383 @@
         # In the base package they can 'use' a fake approval view
         self.browser.open(payment_url + '/fake_approve')
-        self.assertMatches('...Valid callback received...',
+        self.assertMatches('...Successful payment...',
                           self.browser.contents)
         expected = '''...
@@ -1457 +1457 @@
         self.assertEqual(len(self.app['accesscodes']['SFE-0']),0)
         self.browser.open(self.browser.url + '/fake_approve')
-        self.assertMatches('...Valid callback received...',
+        self.assertMatches('...Successful payment...',
                           self.browser.contents)