Changeset 16246

Timestamp:

24 Sep 2020, 06:42:10 (4 years ago)

Author:

Henrik Bettermann

Message:

Fallback: Check current year session if session object does not exist.

Location:

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria

Files:

• etranzact/payoutletbrowser.py (modified) (1 diff)
• etranzact/studentsbrowser.py (modified) (1 diff)
• etranzact/tests.py (modified) (5 diffs)
• interswitch/browser.py (modified) (1 diff)
• remita/studentsbrowser.py (modified) (1 diff)

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/etranzact/payoutletbrowser.py

@@ -53 +53 @@
             'etranzact_payoutlet_enabled', False)
     except KeyError:
-        return False
+        session = datetime.now().year
+        try:
+            return getattr(grok.getSite()['configuration'][str(session)],
+                'etranzact_payoutlet_enabled', False)
+        except KeyError:
+            return False
 
 class EtranzactEnterPinActionButtonApplicant(APABApplicant):

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/etranzact/studentsbrowser.py

@@ -44 +44 @@
             'etranzact_webconnect_enabled', False)
     except KeyError:
-        return False
+        session = datetime.now().year
+        try:
+            return getattr(grok.getSite()['configuration'][str(session)],
+                'etranzact_webconnect_enabled', False)
+        except KeyError:
+            return False
 
 class EtranzactActionButtonStudent(ManageActionButton):

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/etranzact/tests.py

@@ -197 +197 @@
     def test_applicant_views(self):
         # Manager can access Etranzact form
-        self.browser.getLink("Pay via Etranzact").click()
+        self.browser.getLink("Pay via Etranzact WebConnect").click()
         self.assertTrue("Pay now" in self.browser.contents)
         # Means of testing end here.
@@ -203 +203 @@
         self.payment.p_id = TID
         self.browser.open(self.payment_url)
-        self.browser.getLink("Requery Etranzact History").click()
+        self.browser.getLink("Requery Etranzact WebConnect History").click()
         self.assertTrue('Wrong checksum.' in self.browser.contents)
         # ... probably because responseurl of the transaction stored in the
@@ -242 +242 @@
     def test_student_views(self):
         # Manager can access Etranzact form
-        self.browser.getLink("Pay via Etranzact").click()
+        self.browser.getLink("Pay via Etranzact WebConnect").click()
         self.assertTrue("Pay now" in self.browser.contents)
         # Means of testing end here.
@@ -248 +248 @@
         self.payment.p_id = TID
         self.browser.open(self.payment_url)
-        self.browser.getLink("Requery Etranzact History").click()
+        self.browser.getLink("Requery Etranzact WebConnect History").click()
         self.assertTrue('Wrong checksum.' in self.browser.contents)
         # ... probably because responseurl and amount stored in the
@@ -258 +258 @@
     @external_test
     def test_student_payoutlet_views(self):
-        self.browser.getLink("Enter Etranzact PIN").click()
+        self.browser.getLink("Pay via Etranzact PayOutlet").click()
         self.browser.getControl(name="confirmation_number").value = '600854291572447457669'
         self.browser.getControl("Submit to Etranzact").click()
         # This response is strange
         self.assertTrue('-3:Wrong Setup' in self.browser.contents)
-        self.browser.getLink("Enter Etranzact PIN").click()
+        self.browser.getLink("Pay via Etranzact PayOutlet").click()
         # This confirmation number exists
         self.browser.getControl(name="confirmation_number").value = '500854291572447457669'

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

@@ -45 +45 @@
             'interswitch_enabled', True)
     except KeyError:
-        return False
+        session = datetime.now().year
+        try:
+            return getattr(grok.getSite()['configuration'][str(session)],
+                'interswitch_enabled', True)
+        except KeyError:
+            return False
 
 class InterswitchActionButtonStudent(ManageActionButton):

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/remita/studentsbrowser.py

@@ -45 +45 @@
             'remita_enabled', False)
     except KeyError:
-        return False
+        session = datetime.now().year
+        try:
+            return getattr(grok.getSite()['configuration'][str(session)],
+                'remita_enabled', False)
+        except KeyError:
+            return False
 
 # Buttons