Changeset 15755 for main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/etranzact/studentsbrowser.py

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.

File:

• main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/etranzact/studentsbrowser.py (modified) (5 diffs)

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

@@ -33 +33 @@
 
 from kofacustom.nigeria.etranzact.tests import (
-    TERMINAL_ID, HOST, HTTPS, SECRET_KEY, LOGO_URL)
+    TERMINAL_ID, HOST, HTTPS, SECRET_KEY, LOGO_URL, GATEWAY_AMT)
 
 grok.templatedir('browser_templates')
@@ -93 +93 @@
     terminal_id = TERMINAL_ID
     logo_url = LOGO_URL
+    gateway_amt = GATEWAY_AMT
 
     @property
@@ -101 +102 @@
 
     def init_update(self):
+        if not module_activated(self.context.student.current_session):
+            return _("Etranzact payments deactivated.")
         if self.context.p_state == 'paid':
             return _("Payment ticket can't be re-sent to Etranzact.")
@@ -116 +119 @@
         # which authenticates the response.
         self.responseurl = self.url(self.context, 'receive_etranzact')
-        # Already now it becomes a Etranzact payment
-        self.context.r_company = u'etranzact'
-        hashargs =      self.amount + self.terminal_id+self.transaction_id \
+        self.transaction_id = self.context.p_id
+        hashargs =      self.amount + self.terminal_id + self.transaction_id \
             + self.responseurl + self.secret_key
         self.hashvalue = hashlib.md5(hashargs).hexdigest()
@@ -125 +127 @@
 
     def update(self):
-        if not module_activated(self.context.student.current_session):
-            return
-        self.transaction_id = self.context.p_id
+        # 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
+            self.context.amount_auth += self.gateway_amt
+            self.context.gateway_amt = self.gateway_amt
+            self.context.r_company = u'etranzact'
         self.amount = "%.1f" % self.context.amount_auth
         error = self.init_update()