Changeset 15702 for main/kofacustom.nigeria/trunk/src/kofacustom/nigeria

Timestamp:

25 Oct 2019, 09:59:20 (5 years ago)

Author:

Henrik Bettermann

Message:

Add first Payoutlet components. Not yet tested.
Rename eTranzact.

Location:

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

Files:

• etranzact/applicantsbrowser.py (modified) (8 diffs)
• etranzact/browser_templates/enterpin.pt (added)
• etranzact/helpers.py (modified) (1 diff)
• etranzact/payoutletbrowser.py (added)
• etranzact/payoutletwebservice.py (added)
• etranzact/studentsbrowser.py (modified) (8 diffs)
• etranzact/tests.py (modified) (9 diffs)
• interfaces.py (modified) (1 diff)
• interswitch/browser.py (modified) (2 diffs)
• interswitch/tests.py (modified) (11 diffs)
• payments/interfaces.py (modified) (1 diff)

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

@@ -40 +40 @@
     try:
         return getattr(grok.getSite()['configuration'][str(session)],
-            'etranzact_enabled', False)
+            'etranzact_webconnect_enabled', False)
     except KeyError:
         return False
@@ -50 +50 @@
     grok.require('waeup.payApplicant')
     icon = 'actionicon_pay.png'
-    text = _('Pay via eTranzact')
+    text = _('Pay via Etranzact')
     target = 'goto_etranzact'
 
@@ -67 +67 @@
     grok.require('waeup.payApplicant')
     icon = 'actionicon_call.png'
-    text = _('Requery eTranzact History')
+    text = _('Requery Etranzact History')
     target = 'requery_history'
 
@@ -79 +79 @@
 
 class EtranzactPageApplicant(KofaPage):
-    """ View which sends a POST request to the eTranzact payment gateway.
+    """ View which sends a POST request to the Etranzact payment gateway.
     """
     grok.context(INigeriaApplicantOnlinePayment)
@@ -85 +85 @@
     grok.template('goto_etranzact')
     grok.require('waeup.payApplicant')
-    label = _('Pay via eTranzact')
+    label = _('Pay via Etranzact')
     submit_button = _('Pay now')
 
@@ -102 +102 @@
     def init_update(self):
         if self.context.p_state == 'paid':
-            return _("Payment ticket can't be re-sent to eTranzact.")
+            return _("Payment ticket can't be re-sent to Etranzact.")
         now = datetime.utcnow()
         if self.context.creation_date.tzinfo is not None:
@@ -112 +112 @@
         # In contrast to the procedure in the Remita and Interswitch modules,
         # we do not call requery_history but receive and evaluate
-        # the response form from eTranzact directly. This is possible
-        # because eTranzact provides the FINAL_CHECKSUM hash value
+        # the response form from Etranzact directly. This is possible
+        # because Etranzact provides the FINAL_CHECKSUM hash value
         # which authenticates the response.
         self.responseurl = self.url(self.context, 'receive_etranzact')
-        # Already now it becomes a eTranzact payment
+        # Already now it becomes a Etranzact payment
         self.context.r_company = u'etranzact'
         hashargs =      self.amount + self.terminal_id+self.transaction_id \
@@ -166 +166 @@
 
 class EtranzactRequestPaymentStatusPageApplicant(UtilityView, grok.View):
-    """ Request webservice view for the eTranzact gateway.
+    """ Request webservice view for the Etranzact gateway.
     """
     grok.context(INigeriaApplicantOnlinePayment)

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

@@ -135 +135 @@
 def process_response(payment, form, view, verify):
     if not form or not form.get('SUCCESS', None):
-        msg = _('No valid response from eTranzact.')
-        log = 'No valid response from eTranzact for payment %s' % payment.p_id
+        msg = _('No valid response from Etranzact.')
+        log = 'No valid response from Etranzact for payment %s' % payment.p_id
         payment.p_state = 'failed'
         notify(grok.ObjectModifiedEvent(payment))

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

@@ -40 +40 @@
     try:
         return getattr(grok.getSite()['configuration'][str(session)],
-            'etranzact_enabled', False)
+            'etranzact_webconnect_enabled', False)
     except KeyError:
         return False
@@ -50 +50 @@
     grok.require('waeup.payStudent')
     icon = 'actionicon_pay.png'
-    text = _('Pay via eTranzact')
+    text = _('Pay via Etranzact')
     target = 'goto_etranzact'
 
@@ -67 +67 @@
     grok.require('waeup.payStudent')
     icon = 'actionicon_call.png'
-    text = _('Requery eTranzact History')
+    text = _('Requery Etranzact History')
     target = 'requery_history'
 
@@ -79 +79 @@
 
 class EtranzactPageStudent(KofaPage):
-    """ View which sends a POST request to the eTranzact payment gateway.
+    """ View which sends a POST request to the Etranzact payment gateway.
     """
     grok.context(INigeriaStudentOnlinePayment)
@@ -85 +85 @@
     grok.template('goto_etranzact')
     grok.require('waeup.payStudent')
-    label = _('Pay via eTranzact')
+    label = _('Pay via Etranzact')
     submit_button = _('Pay now')
 
@@ -102 +102 @@
     def init_update(self):
         if self.context.p_state == 'paid':
-            return _("Payment ticket can't be re-sent to eTranzact.")
+            return _("Payment ticket can't be re-sent to Etranzact.")
         now = datetime.utcnow()
         if self.context.creation_date.tzinfo is not None:
@@ -112 +112 @@
         # In contrast to the procedure in the Remita and Interswitch modules,
         # we do not call requery_history but receive and evaluate
-        # the response form from eTranzact directly. This is possible
-        # because eTranzact provides the FINAL_CHECKSUM hash value
+        # the response form from Etranzact directly. This is possible
+        # because Etranzact provides the FINAL_CHECKSUM hash value
         # which authenticates the response.
         self.responseurl = self.url(self.context, 'receive_etranzact')
-        # Already now it becomes a eTranzact payment
+        # Already now it becomes a Etranzact payment
         self.context.r_company = u'etranzact'
         hashargs =      self.amount + self.terminal_id+self.transaction_id \
@@ -166 +166 @@
 
 class EtranzactRequestPaymentStatusPageStudent(UtilityView, grok.View):
-    """ Request webservice view for the eTranzact gateway.
+    """ Request webservice view for the Etranzact gateway.
     """
     grok.context(INigeriaStudentOnlinePayment)

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

@@ -48 +48 @@
 SECRET_KEY = 'DEMO_KEY'
 LOGO_URL = 'https://iuokada.waeup.org/static_custom/iou_logo.png'
-
-# Valid transaction id in eTranzact system
+PAYOUTLET_QUERY_URL = 'http://demo.etranzact.com/WebConnectPlus/query.jsp'
+
+# Valid transaction id in Etranzact system
 TID = 'p5689785145198'
 
@@ -143 +144 @@
         # which seems to be valid till next restart of the demo portal.
         raw, formvars = query_history(HOST, self.terminal_id, TID, HTTPS)
-        # Now eTranzact is redirecting but the response is still useless
+        # Now Etranzact is redirecting but the response is still useless
         self.assertTrue('Redirecting...' in raw)
         self.assertEqual(formvars['TRANSACTION_ID'], TID)
@@ -158 +159 @@
         configuration = SessionConfiguration()
         configuration.academic_session = datetime.now().year - 2
-        configuration.etranzact_enabled = True
+        configuration.etranzact_webconnect_enabled = True
+        configuration.etranzact_payoutlet_enabled = True
         self.app['configuration'].addSessionConfiguration(configuration)
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
@@ -176 +178 @@
     @external_test
     def test_applicant_views(self):
-        # Manager can access eTranzact form
-        self.browser.getLink("Pay via eTranzact").click()
+        # Manager can access Etranzact form
+        self.browser.getLink("Pay via Etranzact").click()
         self.assertTrue("Pay now" in self.browser.contents)
         # Means of testing end here.
@@ -183 +185 @@
         self.payment.p_id = TID
         self.browser.open(self.payment_url)
-        self.browser.getLink("Requery eTranzact History").click()
+        self.browser.getLink("Requery Etranzact History").click()
         self.assertTrue('Wrong checksum.' in self.browser.contents)
         # ... probably because responseurl of the transaction stored in the
@@ -199 +201 @@
     def setUp(self):
         super(EtranzactTestsStudents, self).setUp()
-        self.app['configuration']['2004'].etranzact_enabled = True
+        self.app['configuration']['2004'].etranzact_webconnect_enabled = True
+        self.app['configuration']['2004'].etranzact_payoutlet_enabled = True
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.payments_path)
@@ -218 +221 @@
         self.payment = self.student['payments'][self.value]
 
-
     @external_test
     def test_student_views(self):
-        # Manager can access eTranzact form
-        self.browser.getLink("Pay via eTranzact").click()
+        # Manager can access Etranzact form
+        self.browser.getLink("Pay via Etranzact").click()
         self.assertTrue("Pay now" in self.browser.contents)
         # Means of testing end here.
@@ -228 +230 @@
         self.payment.p_id = TID
         self.browser.open(self.payment_url)
-        self.browser.getLink("Requery eTranzact History").click()
+        self.browser.getLink("Requery Etranzact History").click()
         self.assertTrue('Wrong checksum.' in self.browser.contents)
         # ... probably because responseurl and amount stored in the
@@ -235 +237 @@
         # Means of testing end here again.
         return
+
+    @external_test
+    def test_student_payoutlet_views(self):
+        self.browser.getLink("Enter Etranzact PIN").click()
+        self.browser.getControl(name="confirmation_number").value = '1234'
+        self.browser.getControl("Submit to Etranzact").click()

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interfaces.py

@@ -129 +129 @@
         )
 
-    etranzact_enabled = schema.Bool(
-        title = _(u'eTranzact integration enabled'),
+    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,
         )

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

@@ -49 +49 @@
     grok.require('waeup.payStudent')
     icon = 'actionicon_pay.png'
-    text = _('CollegePAY')
+    text = _('Pay via Interswitch')
     target = 'goto_interswitch'
 
@@ -78 +78 @@
     grok.require('waeup.payStudent')
     icon = 'actionicon_call.png'
-    text = _('Requery CollegePAY')
+    text = _('Requery Interswitch History')
     target = 'request_webservice'
 

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

@@ -71 +71 @@
     def test_interswitch_form(self):
         # Manager can access InterswitchForm
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         # The total amount to be processed by Interswitch
         # has been reduced by the Interswitch fee of 150 Nairas
@@ -100 +100 @@
         self.assertEqual(self.student['payments'][value].gateway_amt, 0.0)
         self.browser.getLink(value).click()
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         # Split amounts have been set.
         self.assertEqual(self.student['payments'][value].provider_amt, 0.0)
@@ -112 +112 @@
     def test_interswitch_form_ticket_expired(self):
         # Manager can access InterswitchForm
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches('...<input type="hidden" name="pay_item_id" />...',
                            self.browser.contents)
@@ -124 +124 @@
         self.payment.creation_date -= delta
         self.browser.open(self.payment_url)
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches(
             '...This payment ticket is too old. Please create a new ticket...',
@@ -131 +131 @@
         self.payment.creation_date += delta
         self.browser.open(self.payment_url)
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches('...Total Amount Authorized:...',
                            self.browser.contents)
@@ -139 +139 @@
         # We should not have TZ data in timestamps processed, but it looks
         # like we get some with imports :-/
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         delta = timedelta(days=8)
         self.payment.creation_date -= delta
@@ -146 +146 @@
             self.payment.creation_date)
         self.browser.open(self.payment_url)
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches(
             '...This payment ticket is too old. Please create a new ticket...',
@@ -153 +153 @@
         self.payment.creation_date += delta
         self.browser.open(self.payment_url)
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches('...Total Amount Authorized:...',
                            self.browser.contents)
@@ -240 +240 @@
             self.browser.contents)
         # Manager can access InterswitchForm
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches('...Total Amount Authorized:...',
                            self.browser.contents)
@@ -249 +249 @@
         self.payment.creation_date -= delta
         self.browser.open(self.payment_url)
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches(
             '...This payment ticket is too old. Please create a new ticket...',
@@ -255 +255 @@
         delta = timedelta(days=2)
         self.payment.creation_date += delta
-        self.browser.getLink("CollegePAY", index=0).click()
-        self.assertMatches('...Total Amount Authorized:...',
-                           self.browser.contents)
-
+        self.browser.getLink("Pay via Interswitch", index=0).click()
+        self.assertMatches('...Total Amount Authorized:...',
+                           self.browser.contents)
+

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/payments/interfaces.py

@@ -78 +78 @@
         vocabulary = SimpleKofaVocabulary(
             (_('Interswitch'), 'interswitch'),
-            (_('eTranzact'), 'etranzact'),
+            (_('Etranzact'), 'etranzact'),
             (_('Remita'), 'remita'),
             (_('Scratch Card'), 'sc'),