Index: main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/browser.py
===================================================================
--- main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/browser.py	(revision 15755)
+++ main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/browser.py	(revision 15770)
@@ -38,5 +38,7 @@
 # Buttons
 
-def module_activated(session):
+def module_activated(session, payment):
+    if payment.r_company and payment.r_company != 'interswitch':
+        return False
     try:
         return getattr(grok.getSite()['configuration'][str(session)],
@@ -56,5 +58,6 @@
     @property
     def target_url(self):
-        if not module_activated(self.context.student.current_session):
+        if not module_activated(
+            self.context.student.current_session, self.context):
             return ''
         if self.context.p_state != 'unpaid':
@@ -68,5 +71,6 @@
     @property
     def target_url(self):
-        if not module_activated(self.context.__parent__.__parent__.year):
+        if not module_activated(
+            self.context.__parent__.__parent__.year, self.context):
             return ''
         if self.context.p_state != 'unpaid':
@@ -85,5 +89,6 @@
     @property
     def target_url(self):
-        if not module_activated(self.context.student.current_session):
+        if not module_activated(
+            self.context.student.current_session, self.context):
             return ''
         if self.context.p_state in ('paid', 'waived'):
@@ -98,5 +103,6 @@
     @property
     def target_url(self):
-        if not module_activated(self.context.__parent__.__parent__.year):
+        if not module_activated(
+            self.context.__parent__.__parent__.year, self.context):
             return ''
         if self.context.p_state in ('paid', 'waived'):
@@ -115,5 +121,6 @@
     @property
     def target_url(self):
-        if not module_activated(self.context.student.current_session):
+        if not module_activated(
+            self.context.student.current_session, self.context):
             return ''
         if self.context.p_state != 'paid' \
@@ -129,5 +136,6 @@
     @property
     def target_url(self):
-        if not module_activated(self.context.__parent__.__parent__.year):
+        if not module_activated(
+            self.context.__parent__.__parent__.year, self.context):
             return ''
         if self.context.p_state != 'paid' \
@@ -152,5 +160,6 @@
 
     def update(self):
-        if not module_activated(self.context.student.current_session):
+        if not module_activated(
+            self.context.student.current_session, self.context):
             return
         if self.context.p_state in ('paid', 'waived'):
@@ -191,5 +200,6 @@
 
     def update(self):
-        if not module_activated(self.context.__parent__.__parent__.year):
+        if not module_activated(
+            self.context.__parent__.__parent__.year, self.context):
             return
         if self.context.p_state == 'paid':
@@ -230,5 +240,6 @@
 
     def update(self):
-        if not module_activated(self.context.student.current_session):
+        if not module_activated(
+            self.context.student.current_session, self.context):
             return
         if self.context.p_state  != 'paid' \
@@ -266,5 +277,6 @@
 
     def update(self):
-        if not module_activated(self.context.__parent__.__parent__.year):
+        if not module_activated(
+            self.context.__parent__.__parent__.year, self.context):
             return
         if self.context.p_state != 'paid' \
@@ -348,5 +360,6 @@
 
     def update(self):
-        if not module_activated(self.context.student.current_session):
+        if not module_activated(
+            self.context.student.current_session, self.context):
             return
         error = self.init_update()
@@ -406,5 +419,6 @@
 
     def update(self):
-        if not module_activated(self.context.__parent__.__parent__.year):
+        if not module_activated(
+            self.context.__parent__.__parent__.year, self.context):
             return
         error = self.init_update()
Index: main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/browser_templates/student_goto_interswitch.pt
===================================================================
--- main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/browser_templates/student_goto_interswitch.pt	(revision 15755)
+++ main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/browser_templates/student_goto_interswitch.pt	(revision 15770)
@@ -3,5 +3,6 @@
 
   <p i18n:translate="">
-    These data will be submitted to the CollegePAY payment gateway,
+    These data will be submitted to the CollegePAY payment gateway.
+    Gateway and portal provider fees might have been added to the total amount,
     please check:
   </p>
