Changeset 17381

Timestamp:

17 Apr 2023, 08:48:33 (21 months ago)

Author:

Henrik Bettermann

Message:

Different ratios for fresh and returning students.

File:

• main/kofacustom.edocons/trunk/src/kofacustom/edocons/students/utils.py (modified) (2 diffs)

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

@@ -82 +82 @@
                 amount = getattr(certificate, 'school_fee_2', 0.0)
             else:
-                # Second instalment can be paid in all states.
-                if category == 'secondinstal':
-                    if student.is_fresh:
-                        amount = 0.305 * getattr(certificate, 'school_fee_1', 0.0)
-                    else:
-                        amount = 0.305 * getattr(certificate, 'school_fee_2', 0.0)
                 if student.state == CLEARED:
                     amount = getattr(certificate, 'school_fee_1', 0.0)
@@ -114 +108 @@
                             ), None                    
                 if category == 'schoolfee_1':
-                    amount *= 0.695
+                    if student.is_fresh:
+                        amount *= 0.695
+                    else:
+                        amount *= 0.622
+                # Second instalment can be paid in all states.
+                if category == 'secondinstal':
+                    if student.is_fresh:
+                        amount = 0.305 * getattr(certificate, 'school_fee_1', 0.0)
+                    else:
+                        amount = 0.378 * getattr(certificate, 'school_fee_2', 0.0)
         elif category == 'clearance':
             try: