Changeset 17380

Timestamp:

17 Apr 2023, 07:12:42 (21 months ago)

Author:

Henrik Bettermann

Message:

New instalment ratio

Location:

main/kofacustom.edocons/trunk/src/kofacustom/edocons

Files:

• interswitch/browser.py (modified) (3 diffs)
• interswitch/tests.py (modified) (2 diffs)
• students/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (2 diffs)

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

@@ -19 +19 @@
 import hashlib
 import grok
+import decimal
 from kofacustom.nigeria.interswitch.browser import (
     module_activated,
@@ -97 +98 @@
         xmldict['institution_item_name'] = self.context.category
         xmldict['institution_name'] = INSTITUTION_NAME
-        xmldict['institution_amt'] = 100 * self.context.net_amt
+        xmldict['institution_amt'] = 100*int(decimal.Decimal(str(self.context.net_amt)))
         if not self.context.provider_amt:
             self.context.provider_amt = provider_amt
@@ -116 +117 @@
         self.xml_data = """<input type="hidden" name="xml_data" value='%s'  />""" % xmltext
         self.context.provider_amt = provider_amt
-        self.amount_auth = int(100 * self.context.amount_auth)
+        self.amount_auth = 100*int(decimal.Decimal(str(self.context.amount_auth)))
         hashargs = (
             self.context.p_id +
             PRODUCT_ID +
             self.pay_item_id +
-            str(int(self.amount_auth)) +
+            str(self.amount_auth) +
             self.site_redirect_url +
             self.mac)

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

@@ -94 +94 @@
                            self.browser.contents)
         self.assertTrue(
-            '<span>26400.0</span>' in self.browser.contents)
+            '<span>27800.0</span>' in self.browser.contents)
         self.payment_url = self.browser.url
         self.browser.getLink("Pay via Interswitch CollegePAY", index=0).click()
@@ -101 +101 @@
         self.assertEqual(self.student.current_mode, 'ug_ft')
         self.assertTrue(
-            '<input type="hidden" name="amount" value="2670000" />' in
-            self.browser.contents)
-        self.assertTrue(
-            'item_name="School Fee (66% - 1st instalment)" item_amt="2640000" bank_id="31" acct_num="1489560452"' in
+            '<input type="hidden" name="amount" value="2810000" />' in
+            self.browser.contents)
+        self.assertTrue(
+            'item_name="School Fee (69.5% - 1st instalment)" item_amt="2780000" bank_id="31" acct_num="1489560452"' in
             self.browser.contents)
 

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

@@ -85 +85 @@
                 if category == 'secondinstal':
                     if student.is_fresh:
-                        amount = 0.34 * getattr(certificate, 'school_fee_1', 0.0)
+                        amount = 0.305 * getattr(certificate, 'school_fee_1', 0.0)
                     else:
-                        amount = 0.34 * getattr(certificate, 'school_fee_2', 0.0)
+                        amount = 0.305 * getattr(certificate, 'school_fee_2', 0.0)
                 if student.state == CLEARED:
                     amount = getattr(certificate, 'school_fee_1', 0.0)
@@ -114 +114 @@
                             ), None                    
                 if category == 'schoolfee_1':
-                    amount *= 0.66
+                    amount *= 0.695
         elif category == 'clearance':
             try:

main/kofacustom.edocons/trunk/src/kofacustom/edocons/utils/utils.py

@@ -57 +57 @@
     PAYMENT_CATEGORIES = {
         'schoolfee': 'School Fee (total amount)',
-        'schoolfee_1': 'School Fee (66% - 1st instalment)',
-        'secondinstal': 'School Fee (34% - 2nd instalment)',
+        'schoolfee_1': 'School Fee (69.5% - 1st instalment)',
+        'secondinstal': 'School Fee (30.5% - 2nd instalment)',
         'clearance': 'Acceptance Fee',
         'hostel':'Hostel Fee (1st instalment)',
@@ -76 +76 @@
     SELECTABLE_PAYMENT_CATEGORIES = {
         'schoolfee': 'School Fee (total amount)',
-        'schoolfee_1': 'School Fee (66% - 1st instalment)',
-        'secondinstal': 'School Fee (34% - 2nd instalment)',
+        'schoolfee_1': 'School Fee (69.5% - 1st instalment)',
+        'secondinstal': 'School Fee (30.5% - 2nd instalment)',
         'hostel':'Hostel Fee (1st instalment)',
         'hostel_2':'Hostel Fee (2nd instalment)',