Changeset 15847 for main/kofacustom.skeleton/trunk

Timestamp:

25 Nov 2019, 13:39:39 (5 years ago)

Author:

Henrik Bettermann

Message:

Adjust skeleton. Remove XMLRPC test user.

Location:

main/kofacustom.skeleton/trunk

Files:

• etc/site.zcml.in (modified) (1 diff)
• src/kofacustom/skeleton/etranzact/browser.py (modified) (3 diffs)
• src/kofacustom/skeleton/interfaces.py (modified) (1 diff)
• src/kofacustom/skeleton/remita/browser.py (modified) (2 diffs)

main/kofacustom.skeleton/trunk/etc/site.zcml.in

@@ -46 +46 @@
                  />
 
-      <!-- XMLRPC user for demo and testing
-           Plaintext password is xmlrpcuser1 -->
-      <principal id="zope.xmlrpcuser1"
-                 title="XMLRPC User 1"
-                 login="xmlrpcuser1"
-                 password="{SSHA}ZaL4-UiwmSu6AbLYY-yCS_8vtKpH5Hc6"
-                 password_manager="SSHA"
-                 />
-      <grant role="waeup.xmlrpcusers1"
-             principal="zope.xmlrpcuser1" />
-
       <!-- Replace the following directive if you do not want
            public access -->

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

@@ -22 +22 @@
 from kofacustom.nigeria.etranzact.studentsbrowser import (
     EtranzactPageStudent, EtranzactReceiveResponseStudent,
-    EtranzactRequestPaymentStatusPageStudent)
+    EtranzactRequestPaymentStatusPageStudent,
+    webconnect_module_activated)
 from kofacustom.nigeria.etranzact.payoutletbrowser import (
     EtranzactEnterPinPageStudent, EtranzactEnterPinPageApplicant,
-    EtranzactQueryHistoryPageStudent, EtranzactQueryHistoryPageApplicant)
+    EtranzactQueryHistoryPageStudent, EtranzactQueryHistoryPageApplicant,
+    payoutlet_module_activated)
 from kofacustom.nigeria.etranzact.payoutletwebservice  import NigeriaPaymentDataWebservice
 
@@ -52 +54 @@
         # 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
@@ -91 +96 @@
         # 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.skeleton/trunk/src/kofacustom/skeleton/interfaces.py

@@ -67 +67 @@
         )
 
+    interswitch_enabled = schema.Bool(
+        title = _(u'Interswitch integration enabled'),
+        default = False,
+        )
+
+    etranzact_webconnect_enabled = schema.Bool(
+        title = _(u'Etranzact Webconnect integration enabled'),
+        default = False,
+        )
+
+    etranzact_payoutlet_enabled = schema.Bool(
+        title = _(u'Etranzact Payoutlet integration enabled'),
+        default = False,
+        )
+
 
     # Additional fees in custom package add here

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

@@ -88 +88 @@
 
     def update(self):
-        if not module_activated(self.context.student.current_session):
+        if not module_activated(
+            self.context.student.current_session, self.context):
             return
         self.orderId = self.context.p_id
@@ -154 +155 @@
 
     def update(self):
-        if not module_activated(self.context.__parent__.__parent__.year):
+        if not module_activated(
+            self.context.__parent__.__parent__.year, self.context):
             return
         self.orderId = self.context.p_id