Changeset 8430 for main/waeup.uniben/trunk/src/waeup/uniben/etranzact/browser.py

Timestamp:

12 May 2012, 08:43:51 (13 years ago)

Author:

Henrik Bettermann

Message:

Make waeup.uniben in line with base package. Fortunately we can now use the payment methods used in the base package and do no longer need the actions_after functions in w.u.students.utils and w.u.applicants.utils.

Interswitch and etranzact modules have not been tested with live gateways. The query functions and approval methods may fail.

File:

• main/waeup.uniben/trunk/src/waeup/uniben/etranzact/browser.py (modified) (8 diffs)

main/waeup.uniben/trunk/src/waeup/uniben/etranzact/browser.py

@@ -22 +22 @@
 import grok
 from waeup.kofa.browser.layout import KofaPage, UtilityView
-from waeup.kofa.applicants.viewlets import RequestCallbackActionButton as RCABApplicant
-from waeup.kofa.students.viewlets import RequestCallbackActionButton as RCABStudent
+from waeup.kofa.students.viewlets import ApprovePaymentActionButton as APABStudent
+from waeup.kofa.applicants.viewlets import ApprovePaymentActionButton as APABApplicant
 from waeup.uniben.interfaces import MessageFactory as _
-from waeup.uniben.students.utils import actions_after_student_payment
-from waeup.uniben.applicants.utils import actions_after_applicant_payment
 from waeup.uniben.students.interfaces import ICustomStudentOnlinePayment
 from waeup.uniben.applicants.interfaces import ICustomApplicantOnlinePayment
@@ -35 +33 @@
 QUERY_URL =   'http://demo.etranzact.com:8080/WebConnect/queryPayoutletTransaction.jsp'
 
-def query_etranzact(confirmation_number, user, payment, view):
-    ob_class = view.__implemented__.__name__
+def query_etranzact(confirmation_number, payment):
+    
     postdict = {}
     postdict['TERMINAL_ID'] = TERMINAL_ID
@@ -45 +43 @@
         f = urllib.urlopen(url=QUERY_URL, data=data)
         success = f.read()
-        user.loggerInfo(ob_class, 'callback received: %s' % success)
         if 'COL1' not in success:
-            view.flash(_('Invalid or unsuccessful callback: ${a}',
-                mapping = {'a': success}))
-            user.loggerInfo(ob_class, 'invalid callback: %s' % payment.p_id)
+            msg = _('Invalid or unsuccessful callback: ${a}',
+                mapping = {'a': success})
+            log = 'invalid callback for payment %s: %s' % (payment.p_id, success)
             payment.p_state = 'failed'
-            return False
+            return False, msg, log
         success = success.replace('%20',' ').split('&')
         # We expect at least two parameters
         if len(success) < 2:
-            view.flash(_('Invalid callback: ${a}',
-                mapping = {'a': success}))
-            user.loggerInfo(ob_class, 'invalid callback: %s' % payment.p_id)
+            msg = _('Invalid callback: ${a}', mapping = {'a': success})
+            log = 'invalid callback for payment %s: %s' % (payment.p_id, success)
             payment.p_state = 'failed'
-            return False
+            return False, msg, log
         try:
             success_dict = dict([tuple(i.split('=')) for i in success])
         except ValueError:
-            view.flash(_('Invalid callback: ${a}',
-                mapping = {'a': success}))
-            user.loggerInfo(ob_class, 'invalid callback: %s' % payment.p_id)
+            msg = _('Invalid callback: ${a}', mapping = {'a': success})
+            log = 'invalid callback for payment %s: %s' % (payment.p_id, success)
             payment.p_state = 'failed'
-            return False
+            return False, msg, log
     except IOError:
-        view.flash(_('eTranzact IOError'))
-        return False
+        msg = _('eTranzact IOError')
+        log = 'eTranzact IOError'
+        return False, msg, log
     payment.r_code = u'ET'
     payment.r_desc = u'%s' % success_dict.get('TRANS_DESCR')
@@ -77 +73 @@
     payment.r_pay_reference = u'%s' % success_dict.get('RECEIPT_NO')
     if payment.r_amount_approved != payment.amount_auth:
-        view.flash(_('Wrong amount'))
-        user.loggerInfo(ob_class, 'successful callback but wrong amount: %s'
-            % payment.p_id)
+        msg = _('Wrong amount')
+        log = 'wrong callback for payment %s: %s' % (payment.p_id, success)
         payment.p_state = 'failed'
-        return False
+        return False, msg, log
     tcode = payment.p_id
     tcode = tcode[len(tcode)-8:len(tcode)]
@@ -87 +82 @@
     col1 = col1[len(col1)-8:len(col1)]
     if tcode != col1:
-        view.flash(_('Wrong transaction code'))
-        write_log_message(
-            view,'successful callback but wrong transaction code: %s'
-            % payment.p_id)
-        user.loggerInfo(ob_class, 'successful callback wrong transaction code: %s'
-            % payment.p_id)
+        msg = _('Wrong transaction code')
+        log = 'wrong callback for payment %s: %s' % (payment.p_id, success)
         payment.p_state = 'failed'
-        return False
-    user.loggerInfo(ob_class, 'successful callback: %s' % payment.p_id)
+        return False, msg, log
+    log = 'valid callback for payment %s: %s' % (payment.p_id, success)
+    msg = _('Successful callback received')
     payment.p_state = 'paid'
     payment.payment_date = datetime.now()
-    return True
+    return True, msg, log
 
-class EtranzactEnterPinActionButtonApplicant(RCABApplicant):
+class EtranzactEnterPinActionButtonApplicant(APABApplicant):
     grok.context(ICustomApplicantOnlinePayment)
+    grok.require('waeup.payApplicant')
     grok.order(3)
     icon = 'actionicon_call.png'
@@ -107 +100 @@
     target = 'enterpin'
 
-class EtranzactEnterPinActionButtonStudent(RCABStudent):
+class EtranzactEnterPinActionButtonStudent(APABStudent):
     grok.context(ICustomStudentOnlinePayment)
+    grok.require('waeup.payStudent')
     grok.order(3)
     icon = 'actionicon_call.png'
@@ -140 +134 @@
 
     def update(self, confirmation_number=None):
+        ob_class = self.__implemented__.__name__
         if self.context.p_state == 'paid':
             self.flash(_('This ticket has already been paid.'))
             return
         student = self.context.getStudent()
-        if query_etranzact(confirmation_number, student, self.context, self):
-            actions_after_student_payment(student, self.context, self)
+        success, msg, log = query_etranzact(confirmation_number,self.context)
+        student.loggerInfo(ob_class, log)
+        if not success:
+            self.flash(msg)
+            return
+        success, msg, log = self.context.doAfterStudentPayment()
+        if log is not None:
+            student.loggerInfo(ob_class, log)
+        self.flash(msg)
         return
 
@@ -160 +162 @@
 
     def update(self, confirmation_number=None):
+        ob_class = self.__implemented__.__name__
         if self.context.p_state == 'paid':
             self.flash(_('This ticket has already been paid.'))
             return
         applicant = self.context.__parent__
-        if query_etranzact(confirmation_number, applicant, self.context, self):
-            actions_after_applicant_payment(applicant, self)
+        success, msg, log = query_etranzact(confirmation_number,self.context)
+        applicant.loggerInfo(ob_class, log)
+        if not success:
+            self.flash(msg)
+            return
+        success, msg, log = self.context.doAfterApplicantPayment()
+        if log is not None:
+            applicant.loggerInfo(ob_class, log)
+        self.flash(msg)
         return