Changeset 15755 for main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch

Timestamp:

5 Nov 2019, 23:19:58 (5 years ago)

Author:

Henrik Bettermann

Message:

Prepare all payment gateway modules for net amount fee configuration. In the future, provider and gateway surcharges will be determined and added just before the data are being send to the gateways for the first time.

Location:

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

Files:

• browser.py (modified) (12 diffs)
• tests.py (modified) (2 diffs)

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

@@ -34 +34 @@
 from kofacustom.nigeria.interfaces import MessageFactory as _
 
+GATEWAY_AMT = 300.0
+
 # Buttons
 
@@ -306 +308 @@
     xml_data = None
     hashvalue = None
+    gateway_amt = GATEWAY_AMT
 
     def init_update(self):
@@ -317 +320 @@
         if time_delta.days > 7:
             return _("This payment ticket is too old. Please create a new ticket.")
+        if self.context.r_company and self.context.r_company != 'interswitch':
+            return _("Payment ticket has been used for another payment gateway.")
         student = self.context.student
         certificate = getattr(student['studycourse'],'certificate',None)
@@ -326 +331 @@
             self.context.p_item, self.context.p_session):
             return _("This type of payment has already been made.")
-        self.amount_auth = int(100 * self.context.amount_auth)
         xmldict = {}
         if certificate is not None:
@@ -341 +345 @@
         self.student = student
         self.xmldict = xmldict
-        self.context.r_company = u'interswitch'
         return
 
@@ -351 +354 @@
             self.flash(error, type='danger')
             self.redirect(self.url(self.context, '@@index'))
+        # Already now it becomes an Interswitch 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
+            self.context.amount_auth += self.gateway_amt
+            self.context.gateway_amt = self.gateway_amt
+            self.context.r_company = u'interswitch'
+        self.amount_auth = int(100 * self.context.amount_auth)
         return
 
@@ -363 +374 @@
     label = _('Submit data to CollegePAY (Interswitch Payment Gateway)')
     submit_button = _('Submit')
-    hashvalue = None
 
     action = None
@@ -371 +381 @@
     product_id = None
     xml_data = None
+    hashvalue = None
+    gateway_amt = GATEWAY_AMT
 
     def init_update(self):
@@ -379 +391 @@
             return _("Payment ticket can't be send to CollegePAY. "
                      "Application period has expired.")
+        if self.context.r_company and self.context.r_company != 'interswitch':
+            return _("Payment ticket has been used for another payment gateway.")
         tz = getUtility(IKofaUtils).tzinfo
         time_delta = datetime.utcnow() - self.context.creation_date
@@ -384 +398 @@
             return _("This payment ticket is too old. Please create a new ticket.")
         self.applicant = self.context.__parent__
-        self.amount_auth = int(100 * self.context.amount_auth)
         self.category = self.context.category
         tz = getUtility(IKofaUtils).tzinfo
@@ -390 +403 @@
             self.context.creation_date, tz).strftime("%Y-%m-%d %H:%M:%S %Z")
         self.site_redirect_url = self.url(self.context, 'request_webservice')
-        self.context.r_company = u'interswitch'
         return
 
@@ -400 +412 @@
             self.flash(error, type='danger')
             self.redirect(self.url(self.context, '@@index'))
-        return
+        # Already now it becomes an Interswitch 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
+            self.context.amount_auth += self.gateway_amt
+            self.context.gateway_amt = self.gateway_amt
+            self.context.r_company = u'interswitch'
+        self.amount_auth = int(100 * self.context.amount_auth)
+        return

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

@@ -103 +103 @@
         # Split amounts have been set.
         self.assertEqual(self.student['payments'][value].provider_amt, 0.0)
-        self.assertEqual(self.student['payments'][value].gateway_amt, 0.0)
+        self.assertEqual(self.student['payments'][value].gateway_amt, 300.0)
         self.assertMatches('...<input type="hidden" name="pay_item_id" />...',
                            self.browser.contents)
-        self.assertMatches(
-            '...<input type="hidden" name="amount" value="2000000" />...',
+        self.assertTrue(
+            '<input type="hidden" name="amount" value="2030000" />' in
             self.browser.contents)
 
@@ -118 +118 @@
                            self.browser.contents)
         self.assertEqual(self.student.current_mode, 'ug_ft')
-        self.assertMatches(
-            '...<input type="hidden" name="amount" value="4000000" />...',
+        self.assertTrue(
+            '<input type="hidden" name="amount" value="4030000" />' in
             self.browser.contents)
         delta = timedelta(days=8)