Changeset 18135

Timestamp:

21 Jul 2025, 15:18:07 (5 hours ago)

Author:

Henrik Bettermann

Message:

Minor modifications requested in #252

Location:

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

Files:

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

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

@@ -104 +104 @@
         self.browser.getControl(name="form.p_option").value = ['first']
         self.browser.getControl("Create payment").click()
-        self.assertTrue('must be paid before Tution Fee' in self.browser.contents)
+        self.assertTrue('Sundry charges must be paid before tuition.' in self.browser.contents)
         self.browser.getControl(name="form.p_category").value = ['required_combi']
         self.browser.getControl("Create payment").click()

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

@@ -191 +191 @@
         if student.state not in (CLEARANCE, REQUESTED, CLEARED, RETURNING):
             return
+            
         # Has the required combi payment been made?
         for ticket in student['payments'].values():
@@ -197 +198 @@
                 ticket.p_state == 'paid':
                 return
-        # If not, check single payments
+
+        # If not, check single payments (no longer possible)
         rp = self._collect_required_payment_items(student)
         cats_missing = deepcopy(rp)
@@ -215 +217 @@
                 if not cats_missing:
                     return
-        return "%s must be paid before Tution Fee." % ', '.join(
-            cats_missing.values())
+        #return "%s must be paid before Tution Fee." % ', '.join(
+        #    cats_missing.values())
+
+        return "Sundry charges must be paid before tuition."
 
     @property

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

@@ -77 +77 @@
         'makeup_admin': 'Make-Up Registration Fee',
         'id_card': 'Student ID Card',
-        'required_combi': 'Required Sundry Payment',
+        'required_combi': 'Required Sundry Charges',
         'pg_other': 'PG Other Charges',
         'jupeb_form':'JUPEB Form Fee',
@@ -129 +129 @@
         'late_registration': 'Late Registration Fee',
         'clinical': 'Clinical Fee (Medical Students)',
-        'pharmlab': 'Pharmacy Lab Support Fee',
         'lo_ident': 'Letter of Identification Fee',
         'change_course': 'Change of Course Fee',
@@ -145 +144 @@
         #'resit9': '9 Make-Up Examination Courses',
         'makeup_admin': 'Make-Up Registration Fee',
-        'required_combi': 'Required Sundry Payment',
+        'required_combi': 'Required Sundry Charges',
         'pg_other': 'PG Other Charges',
         #'jupeb_form':'JUPEB Form Fee',
@@ -171 +170 @@
         ## sundry: 'develop': 'Development Fee',
         ## sundry: 'health_insurance': 'Student Health Insurance',
+        ## sundry: 'pharmlab': 'Pharmacy Lab Support Fee',
         }
 
@@ -241 +241 @@
         'fine': 'Fine',
         'id_card': 'Student ID Card',
-        #'required_combi': 'Required Sundry Payment',
+        #'required_combi': 'Required Sundry Charges',
         'pg_other': 'PG Other Charges',
         #'jupeb_form':'JUPEB Form Fee',
@@ -304 +304 @@
         ## sundry: 'develop': 'Development Fee',
         ## sundry: 'health_insurance': 'Student Health Insurance',
+        ## sundry: 'pharmlab': 'Pharmacy Lab Support Fee',
         'clinical': 'Clinical Fee (Medical Students)',
         'late_registration': 'Late Registration Fee',
-        'pharmlab': 'Pharmacy Lab Support Fee',
         'lo_ident': 'Letter of Identification Fee',
         'change_course': 'Change of Course Fee',