Changeset 15663

Timestamp:

13 Oct 2019, 13:44:40 (5 years ago)

Author:

Henrik Bettermann

Message:

School fee instalment payment (2nd version)

Location:

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

Files:

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

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

@@ -79 +79 @@
             self.browser.contents)
         self.assertTrue(
-            'item_name="Tuition Plus Total" item_amt="3985000" bank_id="00" acct_num="00000000"' in
+            'item_name="Tuition Plus (total amount)" item_amt="3985000" bank_id="00" acct_num="00000000"' in
             self.browser.contents)
 

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

@@ -81 +81 @@
         # Determine fee.
         if category in ('schoolfee', 'schoolfee40',
-                        'schoolfee50', 'schoolfee60'):
+                        'secondinstal'):
             try:
                 certificate = student['studycourse'].certificate
@@ -121 +121 @@
                             ), None
                     amount = getattr(certificate, 'school_fee_2', 0.0)
+            if category == 'schoolfee40':
+                amount *= 0.4
+            elif category == 'secondinstal':
+                amount *= 0.6
         elif category == 'clearance':
             try:

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

@@ -27 +27 @@
 
     PAYMENT_CATEGORIES = {
-        'schoolfee40': 'Tuition Plus 40',
-        'schoolfee50': 'Tuition Plus 50',
-        'schoolfee60': 'Tuition Plus 60',
-        'schoolfee': 'Tuition Plus Total',
+        'schoolfee': 'Tuition Plus (total amount)',
+        'schoolfee40': 'Tuition Plus (40% - 1st instalment)',
+        'secondinstal': 'Tuition Plus (60% - 2nd instalment))',
         'clearance': 'Acceptance Fee',
         #'bed_allocation': 'Bed Allocation Fee',
@@ -55 +54 @@
 
     SELECTABLE_PAYMENT_CATEGORIES = {
+        'schoolfee': 'Tuition, Accommodation, Adm. Charges (total amount)',
         'schoolfee40': 'Tuition, Accommodation, Adm. Charges (40% - 1st instalment)',
-        'schoolfee50': 'Tuition, Accommodation, Adm. Charges (50% - 1st instalment)',
-        'schoolfee60': 'Tuition, Accommodation, Adm. Charges (60% - 1st instalment)',
-        'schoolfee': 'Tuition, Accommodation, Adm. Charges (total amount)',
+        'secondinstal': 'Tuition, Accommodation, Adm. Charges (60% - 2nd instalment)',
         #'bed_allocation': 'Bed Allocation Fee',
         #'hostel_maintenance': 'Accommodation',