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

Timestamp:

11 May 2012, 16:32:07 (13 years ago)

Author:

Henrik Bettermann

Message:

Use same technique for approval of payments in students and in applicants.

Location:

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

Files:

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

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

@@ -599 +599 @@
 
     def update(self):
-        self.wf_info = IWorkflowInfo(self.context.__parent__)
-        try:
-            self.wf_info.fireTransition('pay')
-        except InvalidTransitionError:
-            self.flash('Error: %s' % sys.exc_info()[1])
-            return
-        self.context.approve()
-        ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
-        self.context.__parent__.loggerInfo(
-            ob_class, 'valid callback: %s' % self.context.p_id)
-        self.flash(_('Valid callback received.'))
+        success, msg = self.context.approveApplicantPayment()
+        if success:
+            ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
+            self.context.__parent__.loggerInfo(
+                ob_class, 'valid callback: %s' % self.context.p_id)
+        self.flash(msg)
         return
 

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

@@ -517 +517 @@
 
     """
+
+    def doAfterApplicantPayment():
+        """Process applicant after payment was made.
+
+        """
+
+    def approveApplicantPayment():
+        """Approve payment and process applicant.
+
+        """

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

@@ -20 +20 @@
 """
 import grok
+from hurry.workflow.interfaces import IWorkflowInfo
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
+from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.payments import OnlinePayment
 from waeup.kofa.applicants.interfaces import IApplicantOnlinePayment
@@ -35 +37 @@
         super(ApplicantOnlinePayment, self).__init__()
         return
+
+    def doAfterApplicantPayment(self):
+        """Process applicant after payment was made.
+        """
+        wf_info = IWorkflowInfo(self.__parent__)
+        try:
+            wf_info.fireTransition('pay')
+        except InvalidTransitionError:
+            return False, 'Error: %s' % sys.exc_info()[1]
+        return True, _('Valid callback received.')
+
+    def approveApplicantPayment(self):
+        """Approve payment and process applicant.
+        """
+        if self.p_state == 'paid':
+            return False, _('This ticket has already been paid.')
+        self.approve()
+        return self.doAfterApplicantPayment()
 
 ApplicantOnlinePayment = attrs_to_fields(ApplicantOnlinePayment)