Changeset 16270 for main

Timestamp:

5 Oct 2020, 13:19:29 (4 years ago)

Author:

Henrik Bettermann

Message:

provider_amt has already to be stored when creating the payment ticket. Otherwise students will go to the bank and pay without this fee.

Location:

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada

Files:

• etranzact/browser.py (modified) (3 diffs)
• interswitch/browser.py (modified) (1 diff)
• interswitch/tests.py (modified) (4 diffs)
• students/utils.py (modified) (1 diff)

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/etranzact/browser.py

@@ -159 +159 @@
         # Already now it becomes an Etranzact payment. We set the net amount
         # and add the gateway amount.
-        provider_amt = 0.0
-        if self.context.p_category in (
-            'registration', 'required_combi', 'pg_other'):
-            provider_amt = 5000.0
-        if not self.context.r_company:
-            self.context.net_amt = self.context.amount_auth
-            self.context.amount_auth += self.gateway_amt
-            self.context.amount_auth += provider_amt
-            self.context.gateway_amt = self.gateway_amt
-            self.context.provider_amt = provider_amt
+        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
@@ -222 +216 @@
         # Already now it becomes an Etranzact payment. We set the net amount
         # and add the gateway amount.
-        provider_amt = 0.0
-        if self.context.p_category in (
-            'registration', 'required_combi', 'pg_other'):
-            provider_amt = 5000.0
-        if not self.context.r_company:
-            self.context.net_amt = self.context.amount_auth
-            self.context.amount_auth += self.gateway_amt
-            self.context.amount_auth += provider_amt
-            self.context.gateway_amt = self.gateway_amt
-            self.context.provider_amt = provider_amt
+        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'
         return
@@ -248 +236 @@
         # Already now it becomes an Etranzact payment. We set the net amount
         # and add the gateway amount.
-        provider_amt = 0.0
-        if not self.context.r_company:
-            self.context.net_amt = self.context.amount_auth
-            self.context.amount_auth += self.gateway_amt
-            self.context.amount_auth += provider_amt
-            self.context.gateway_amt = self.gateway_amt
-            self.context.provider_amt = provider_amt
+        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'
         return

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

@@ -126 +126 @@
         xmldict['institution_item_name'] = self.context.category
         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
+        xmldict['institution_amt'] = 100 * self.context.net_amt - (
+            100 * provider_amt)
         if provider_amt == 0:
             xmltext = """<payment_item_detail>

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

@@ -53 +53 @@
 
     def test_interswitch_form(self):
-        self.app['configuration']['2004'].registration_fee = 2000.0
+        self.app['configuration']['2004'].registration_fee = 7000.0
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.payments_path)
@@ -62 +62 @@
         self.browser.getControl("Create payment").click()
         self.assertTrue('Payment created' in self.browser.contents)
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         self.value = ctrl.options[0]
         self.browser.getLink(self.value).click()
         self.assertTrue(
-            '<span>2000.0</span>' in self.browser.contents)
+            '<span>7000.0</span>' in self.browser.contents)
         self.payment_url = self.browser.url
         self.browser.getLink("Pay via Interswitch", index=0).click()
@@ -75 +76 @@
         payment = self.student['payments'][self.value]
         self.assertEqual(payment.amount_auth, 7250)
-        self.assertEqual(payment.net_amt, 2000)
+        self.assertEqual(payment.net_amt, 7000)
         self.assertTrue(
             '<input type="hidden" name="amount" value="725000" />' in
             self.browser.contents)
+        # WAeAC charge have been substracted
         self.assertTrue(
             'item_name="Registration Fee" item_amt="200000" bank_id="117" acct_num="1011050158"' in
+            self.browser.contents)
+        self.assertTrue(
+            'item_name="WAeAC" item_amt="500000" bank_id="31" acct_num="0773411069"' in
             self.browser.contents)
 
@@ -99 +104 @@
                            self.browser.contents)
         self.assertEqual(self.student.current_mode, 'ug_ft')
-        # 5000 provider charge and 250 gateway charge have been added
-        self.assertTrue(
-            '<input type="hidden" name="amount" value="625000" />' in
-            self.browser.contents)
-        self.assertEqual(acc_payment.amount_auth, 6250)
+        # 250 gateway charge have been added
+        self.assertTrue(
+            '<input type="hidden" name="amount" value="125000" />' in
+            self.browser.contents)
+        self.assertEqual(acc_payment.amount_auth, 1250)
         self.assertEqual(acc_payment.net_amt, 1000)
         delta = timedelta(days=8)

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py

@@ -247 +247 @@
         payment = createObject(u'waeup.StudentOnlinePayment')
         timestamp = ("%d" % int(time()*10000))[1:]
+        if category in (
+            'registration', 'required_combi', 'pg_other'):
+            payment.provider_amt = 5000.0
+        if category in (
+            'schoolfee', 'schoolfee40') and student.is_jupeb:
+            payment.provider_amt = 5000.0
         payment.p_id = "p%s" % timestamp
         payment.p_category = category