Changeset 16709 for main/kofacustom.edocons

Timestamp:

9 Nov 2021, 15:57:09 (3 years ago)

Author:

Henrik Bettermann

Message:

Change ratio.

Location:

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

Files:

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

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

@@ -80 +80 @@
             self.browser.contents)
         self.assertTrue(
-            'item_name="School Fee (total amount)" item_amt="4000000" bank_id="00" acct_num="00000000"' in
+            'item_name="School Fee (total amount)" item_amt="4000000" bank_id="31" acct_num="1489560452"' in
             self.browser.contents)
         self.browser.open(self.payments_path + '/addop')
@@ -94 +94 @@
                            self.browser.contents)
         self.assertTrue(
-            '<span>24000.0</span>' in self.browser.contents)
+            '<span>26400.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="2430000" />' in
-            self.browser.contents)
-        self.assertTrue(
-            'item_name="School Fee (60% - 1st instalment)" item_amt="2400000" bank_id="00" acct_num="00000000"' in
+            '<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
             self.browser.contents)
 

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

@@ -73 +73 @@
             else:
                 if category == 'secondinstal':
-                    amount = 0.4 * getattr(certificate, 'school_fee_1', 0.0)
+                    amount = 0.34 * getattr(certificate, 'school_fee_1', 0.0)
                 else:
                     if student.state == CLEARED:
@@ -101 +101 @@
                         amount = getattr(certificate, 'school_fee_1', 0.0)
                     if category == 'schoolfee_1':
-                        amount *= 0.6
+                        amount *= 0.66
         elif category == 'clearance':
             try:

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

@@ -26 +26 @@
     PAYMENT_CATEGORIES = {
         'schoolfee': 'School Fee (total amount)',
-        'schoolfee_1': 'School Fee (60% - 1st instalment)',
-        'secondinstal': 'School Fee (40% - 2nd instalment)',
+        'schoolfee_1': 'School Fee (66% - 1st instalment)',
+        'secondinstal': 'School Fee (34% - 2nd instalment)',
         'clearance': 'Acceptance Fee (not applicable)',
         #'bed_allocation': 'Bed Allocation Fee',
@@ -42 +42 @@
     SELECTABLE_PAYMENT_CATEGORIES = {
         'schoolfee': 'School Fee (total amount)',
-        'schoolfee_1': 'School Fee (60% - 1st instalment)',
-        'secondinstal': 'School Fee (40% - 2nd instalment)',
+        'schoolfee_1': 'School Fee (66% - 1st instalment)',
+        'secondinstal': 'School Fee (34% - 2nd instalment)',
         }