Changeset 16593

Timestamp:

31 Aug 2021, 15:26:46 (3 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes in base package.

Location:

main/kofacustom.ecns/trunk/src/kofacustom/ecns

Files:

• etranzact/browser.py (modified) (3 diffs)
• interswitch/browser.py (modified) (4 diffs)
• remita/browser.py (modified) (2 diffs)

main/kofacustom.ecns/trunk/src/kofacustom/ecns/etranzact/browser.py

@@ -52 +52 @@
 
     def update(self):
+        if not webconnect_module_activated(
+            self.context.__parent__.__parent__.year, self.context):
+            self.flash(_('Forbidden'), type='danger')
+            self.redirect(self.url(self.context, '@@index'))
+            return
         # Already now it becomes an Etranzact payment. We set the net amount
         # and add the gateway amount.
-        if not webconnect_module_activated(
-            self.context.__parent__.__parent__.year, self.context):
-            return _("Etranzact payments deactivated.")
         if not self.context.r_company:
             self.context.net_amt = self.context.amount_auth
@@ -67 +69 @@
             self.flash(error, type='danger')
             self.redirect(self.url(self.context, '@@index'))
-            return
         return
 
@@ -94 +95 @@
 
     def update(self):
+        if not webconnect_module_activated(
+            self.context.student.current_session, self.context):
+            self.flash(_('Forbidden'), type='danger')
+            self.redirect(self.url(self.context, '@@index'))
+            return
         # Already now it becomes an Etranzact payment. We set the net amount
         # and add the gateway amount.
-        if not webconnect_module_activated(
-            self.context.student.current_session, self.context):
-            return _("Etranzact payments deactivated.")
         if not self.context.r_company:
             self.context.net_amt = self.context.amount_auth

main/kofacustom.ecns/trunk/src/kofacustom/ecns/interswitch/browser.py

@@ -20 +20 @@
 import grok
 from kofacustom.nigeria.interswitch.browser import (
+    module_activated,
     InterswitchPaymentRequestWebservicePageApplicant,
     InterswitchPaymentRequestWebservicePageStudent,
@@ -31 +32 @@
 
 PRODUCT_ID = '' # must be provided by Interswitch
-SITE_NAME = 'ecns-kofa.waeup.org'
+SITE_NAME = 'ecns.waeup.org'
 PROVIDER_ACCT = '00000000'
 PROVIDER_BANK_ID = '00'
@@ -63 +64 @@
 
     def update(self):
+        if not module_activated(
+            self.context.student.current_session, self.context):
+            self.flash(_('Forbidden'), type='danger')
+            self.redirect(self.url(self.context, '@@index'))
+            return
         error = self.init_update()
         if error:
@@ -134 +140 @@
 
     def update(self):
+        if not module_activated(
+            self.context.__parent__.__parent__.year, self.context):
+            self.flash(_('Forbidden'), type='danger')
+            self.redirect(self.url(self.context, '@@index'))
+            return
         error = self.init_update()
         if error:

main/kofacustom.ecns/trunk/src/kofacustom/ecns/remita/browser.py

@@ -90 +90 @@
         if not module_activated(
             self.context.student.current_session, self.context):
+            self.flash(_('Forbidden'), type='danger')
+            self.redirect(self.url(self.context, '@@index'))
             return
         self.orderId = self.context.p_id
@@ -157 +159 @@
         if not module_activated(
             self.context.__parent__.__parent__.year, self.context):
+            self.flash(_('Forbidden'), type='danger')
+            self.redirect(self.url(self.context, '@@index'))
             return
         self.orderId = self.context.p_id