Index: /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/browser.py
===================================================================
--- /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/browser.py	(revision 13584)
+++ /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/browser.py	(revision 13585)
@@ -86,5 +86,6 @@
     @property
     def target_url(self):
-        if self.context.p_state != 'paid':
+        if self.context.p_state != 'paid' \
+            or self.context.r_company != u'interswitch':
             return ''
         return self.view.url(self.view.context, self.target)
@@ -186,5 +187,6 @@
 
     def update(self):
-        if self.context.p_state  != 'paid':
+        if self.context.p_state  != 'paid' \
+            or self.context.r_company != u'interswitch':
             self.flash(_('This ticket has not been paid.'), type='danger')
             return
@@ -219,5 +221,6 @@
 
     def update(self):
-        if self.context.p_state != 'paid':
+        if self.context.p_state != 'paid' \
+            or self.context.r_company != u'interswitch':
             self.flash(_('This ticket has not been paid.'), type='danger')
             return
Index: /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/helpers.py
===================================================================
--- /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/helpers.py	(revision 13584)
+++ /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/helpers.py	(revision 13585)
@@ -95,4 +95,5 @@
 def query_interswitch_SOAP(payment, product_id, host, url, https, verify):
     sr = get_SOAP_response(product_id, payment.p_id, host, url, https)
+    log = 'invalid callback for payment %s: %s' % (payment.p_id, str(jr))
     if sr.startswith('Connection error'):
         msg = _('Connection error')
@@ -102,4 +103,8 @@
     if len(wlist) != 7:
         msg = _('Invalid callback: ${a}', mapping = {'a': sr})
+        log = 'invalid callback for payment %s: %s' % (payment.p_id, sr)
+        return False, msg, log
+    if verify and jr['ResponseCode'] == '20050':
+        msg = _('Integration method has changed.')
         log = 'invalid callback for payment %s: %s' % (payment.p_id, sr)
         return False, msg, log
@@ -170,4 +175,8 @@
         log = 'invalid callback for payment %s: %s' % (payment.p_id, str(jr))
         return False, msg, log
+    if verify and jr['ResponseCode'] == '20050':
+        msg = _('Integration method has changed.')
+        log = 'invalid callback for payment %s: %s' % (payment.p_id, str(jr))
+        return False, msg, log
     payment.r_code = jr['ResponseCode']
     payment.r_desc = jr['ResponseDescription']
