Changeset 15999 for main

Timestamp:

11 Feb 2020, 09:51:47 (5 years ago)

Author:

Henrik Bettermann

Message:

Some adjustments to base package.

Location:

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada

Files:

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

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

@@ -51 +51 @@
 
     def update(self):
-        # 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.")
+            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 self.context.r_company:
             self.context.net_amt = self.context.amount_auth
@@ -93 +95 @@
 
     def update(self):
-        # 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.")
+            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 self.context.r_company:
             self.context.net_amt = self.context.amount_auth
@@ -135 +139 @@
         if not payoutlet_module_activated(
             self.context.student.current_session, self.context):
-            return
-        super(EtranzactEnterPinPageStudent, self).update()
+            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.
@@ -159 +164 @@
         if not payoutlet_module_activated(
             self.context.__parent__.__parent__.year, self.context):
-            return
-        super(EtranzactEnterPinPageApplicant, self).update()
+            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.

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

@@ -20 +20 @@
 import grok
 from kofacustom.nigeria.interswitch.browser import (
+    module_activated,
     InterswitchPaymentRequestWebservicePageApplicant,
     InterswitchPaymentRequestWebservicePageStudent,
@@ -64 +65 @@
 
     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:
@@ -158 +164 @@
 
     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.iuokada/trunk/src/kofacustom/iuokada/students/browser.py

@@ -45 +45 @@
     NigeriaStudentBaseEditFormPage,
     NigeriaBedTicketAddPage,
-    NigeriaAccommodationManageFormPage
+    NigeriaAccommodationManageFormPage,
+    NigeriaAccommodationDisplayFormPage,
     )
 
@@ -92 +93 @@
     #            )
     #    return ()
+
+class CustomAccommodationDisplayFormPage(NigeriaAccommodationDisplayFormPage):
+    """ Page to view bed tickets.
+    """
+    with_hostel_selection = True
 
 class CustomAccommodationManageFormPage(NigeriaAccommodationManageFormPage):