Changeset 7998

Timestamp:

28 Mar 2012, 20:50:45 (12 years ago)

Author:

Henrik Bettermann

Message:

Neutralize callback simulation components in base package.

Location:

main/waeup.custom/trunk/src/waeup/custom

Files:

• interswitch/browser.py (modified) (3 diffs)
• interswitch/tests.py (modified) (2 diffs)
• students/browser.py (modified) (3 diffs)

main/waeup.custom/trunk/src/waeup/custom/interswitch/browser.py

@@ -102 +102 @@
         if self.context.p_state == 'paid':
             return ''
-        site_redirect_url = self.view.url(self.view.context, 'callback')
+        site_redirect_url = self.view.url(self.view.context, 'isw_callback')
         args = {
             'transRef':self.context.p_id,
@@ -143 +143 @@
         self.amount_100 = 100 * self.amount
         self.local_date_time = str(self.context.creation_date)
-        self.site_redirect_url = self.url(self.context, 'callback')
+        self.site_redirect_url = self.url(self.context, 'isw_callback')
         certificate = getattr(self.student['studycourse'],'certificate',None)
         xmldict = {}
@@ -176 +176 @@
     """
     grok.context(IStudentOnlinePayment)
-    grok.name('callback')
+    grok.name('isw_callback')
     grok.require('waeup.payStudent')
 

main/waeup.custom/trunk/src/waeup/custom/interswitch/tests.py

@@ -61 +61 @@
     def callback_url(self, payment_url, resp, apprAmt):
         return payment_url + (
-            '/callback?echo=' +
+            '/isw_callback?echo=' +
             '&resp=%s' +
             '&desc=Something went wrong' +
@@ -89 +89 @@
         self.assertMatches('...Failed...',
                            self.browser.contents)
-        self.browser.open(self.payment_url + '/callback')
+        self.browser.open(self.payment_url + '/isw_callback')
         self.assertMatches('...Unsuccessful callback: Incomplete query string...',
                           self.browser.contents)

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

@@ -24 +24 @@
     StudentPersonalDisplayFormPage, StudentPersonalManageFormPage,
     StudentClearanceManageFormPage, StudentClearanceEditFormPage,
-    StudentClearanceDisplayFormPage,
+    StudentClearanceDisplayFormPage, OnlinePaymentCallbackPage,
     ExportPDFClearanceSlipPage)
 from waeup.kofa.students.viewlets import RequestCallbackActionButton
@@ -32 +32 @@
     )
 from waeup.custom.interfaces import MessageFactory as _
+
+class RequestCallbackActionButton(RequestCallbackActionButton):
+    """ Do not display the base package callback button in custom pages.
+    """
+    @property
+    def target_url(self):
+        return ''
+
+class OnlinePaymentCallbackPage(OnlinePaymentCallbackPage):
+    """ Neutralize callback simulation view
+    """
+    def update(self):
+        return
 
 class StudentPersonalDisplayFormPage(StudentPersonalDisplayFormPage):
@@ -106 +119 @@
         return form_fields
 
-class RequestCallbackActionButton(RequestCallbackActionButton):
-    """ Do not display the base package callback button in custom pages.
-    """
-
-    @property
-    def target_url(self):
-        return ''