Changeset 17382 for main

Timestamp:

17 Apr 2023, 08:53:50 (21 months ago)

Author:

Henrik Bettermann

Message:

More precisely

Location:

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

Files:

• interswitch/tests.py (modified) (1 diff)
• students/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (2 diffs)

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

@@ -104 +104 @@
             self.browser.contents)
         self.assertTrue(
-            'item_name="School Fee (69.5% - 1st instalment)" item_amt="2780000" bank_id="31" acct_num="1489560452"' in
+            'item_name="School Fee (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

@@ -111 +111 @@
                         amount *= 0.695
                     else:
-                        amount *= 0.622
+                        amount *= 0.621621621
                 # Second instalment can be paid in all states.
                 if category == 'secondinstal':
@@ -117 +117 @@
                         amount = 0.305 * getattr(certificate, 'school_fee_1', 0.0)
                     else:
-                        amount = 0.378 * getattr(certificate, 'school_fee_2', 0.0)
+                        amount = 0.378378378 * getattr(certificate, 'school_fee_2', 0.0)
         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 (69.5% - 1st instalment)',
-        'secondinstal': 'School Fee (30.5% - 2nd instalment)',
+        'schoolfee_1': 'School Fee (1st instalment)',
+        'secondinstal': 'School Fee (2nd instalment)',
         'clearance': 'Acceptance Fee',
         'hostel':'Hostel Fee (1st instalment)',
@@ -76 +76 @@
     SELECTABLE_PAYMENT_CATEGORIES = {
         'schoolfee': 'School Fee (total amount)',
-        'schoolfee_1': 'School Fee (69.5% - 1st instalment)',
-        'secondinstal': 'School Fee (30.5% - 2nd instalment)',
+        'schoolfee_1': 'School Fee (1st instalment)',
+        'secondinstal': 'School Fee (2nd instalment)',
         'hostel':'Hostel Fee (1st instalment)',
         'hostel_2':'Hostel Fee (2nd instalment)',