Changeset 16764 for main/kofacustom.dspg/trunk/src/kofacustom

Timestamp:

31 Jan 2022, 10:09:15 (3 years ago)

Author:

Henrik Bettermann

Message:

is_freshis the wrong condition for fresh student school fee payments.

Location:

main/kofacustom.dspg/trunk/src/kofacustom/dspg/students

Files:

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

main/kofacustom.dspg/trunk/src/kofacustom/dspg/students/tests/test_utils.py

@@ -110 +110 @@
         self.assertEqual(payment.p_level, 200)
         self.assertEqual(payment.p_session, 2005)
-        # 9999 + 5950 + 15000 4250
-        self.assertEqual(payment.amount_auth, 35199.0)
+        # 9999 + 15000 + 1200
+        self.assertEqual(payment.amount_auth, 26199.0)
 

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

@@ -31 +31 @@
 
 def MICROSOFT_FEE(student):
-    if student.is_fresh:
+    if student.state == CLEARED:
         return 5950.0
     return 0.0
@@ -41 +41 @@
 
 def TECH_FEE(student):
-    if student.is_fresh:
+    if student.state == CLEARED:
         return 4250.0
     return 1200.0