Changeset 16850

Timestamp:

1 Mar 2022, 09:35:12 (3 years ago)

Author:

Henrik Bettermann

Message:

Add fees only once.

File:

• main/kofacustom.unidel/trunk/src/kofacustom/unidel/interswitch/browser.py (modified) (3 diffs)

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

@@ -75 +75 @@
             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'
         student = self.student
         xmldict = self.xmldict
@@ -93 +86 @@
         xmldict['institution_bank_id'] = '117'
         provider_amt = 0.0
-        tech_fee = 1200
+        tech_fee = 0.0
         if self.context.p_category == 'clearance':
             provider_amt = 500.0
         if self.context.p_category == 'schoolfee':
             provider_amt = 2800.0
-            tech_fee = 1200
+            tech_fee = 1200.0
         self.pay_item_id = 'Default_Payable_MX47126' # must be provided by Interswitch
+        # Already now it becomes an Interswitch payment. We set the net amount
+        # and add gateway amount and other surcharges.
+        if not self.context.r_company:
+            self.context.r_company = u'interswitch'
+            self.context.net_amt = self.context.amount_auth
+            self.context.gateway_amt = self.gateway_amt
+            self.context.amount_auth += self.gateway_amt
+            self.context.provider_amt = provider_amt
+            self.context.amount_auth += provider_amt
+            self.context.amount_auth += tech_fee
         xmldict['provider_amt'] = 100 * provider_amt
         xmldict['tech_fee'] = 100 * tech_fee
@@ -105 +108 @@
         xmldict['institution_name'] = INSTITUTION_NAME
         xmldict['institution_amt'] = 100 * self.context.net_amt
-        if not self.context.provider_amt:
-            self.context.provider_amt = provider_amt
-            self.context.amount_auth += provider_amt
-        self.context.amount_auth += tech_fee
         if provider_amt == 0:
             xmltext = """<payment_item_detail>