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

Timestamp:

15 May 2012, 20:29:34 (13 years ago)

Author:

Henrik Bettermann

Message:

Applicants must not trigger the the approve transition which lead to wrong history message.

Distinguish between payment approval and regular payment in log files too.

Location:

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

Files:

• interfaces.py (modified) (1 diff)
• payment.py (modified) (3 diffs)

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

@@ -523 +523 @@
         """
 
+    def doAfterApplicantPaymentApproval():
+        """Process applicant after payment was approved.
+
+        """
+
     def approveApplicantPayment():
         """Approve payment and process applicant.

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

@@ -40 +40 @@
         return
 
+    def doAfterApplicantPaymentApproval(self):
+        """Process applicant after payment was approved.
+        """
+        wf_info = IWorkflowInfo(self.__parent__)
+        try:
+            wf_info.fireTransition('approve')
+        except InvalidTransitionError:
+            msg = log = 'Error: %s' % sys.exc_info()[1]
+            return False, msg, log
+        log = 'payment approved: %s' % self.p_id
+        msg = _('Payment approved')
+        return False, msg, log
+
     def doAfterApplicantPayment(self):
         """Process applicant after payment was made.
@@ -45 +58 @@
         wf_info = IWorkflowInfo(self.__parent__)
         try:
-            wf_info.fireTransition('approve')
+            wf_info.fireTransition('pay')
         except InvalidTransitionError:
             msg = log = 'Error: %s' % sys.exc_info()[1]
@@ -59 +72 @@
             return False, _('This ticket has already been paid.'), None
         self.approve()
-        return self.doAfterApplicantPayment()
+        return self.doAfterApplicantPaymentApproval()
 
 ApplicantOnlinePayment = attrs_to_fields(ApplicantOnlinePayment)