Changeset 17102

Timestamp:

15 Sep 2022, 16:49:06 (2 years ago)

Author:

Henrik Bettermann

Message:

Remove hardoced ict_entre_fee.

Location:

main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students

Files:

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

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

@@ -69 +69 @@
         configuration.academic_session = 2005
         self.app['configuration'].addSessionConfiguration(configuration)
-        self.app['configuration']['2004'].ict_entre_fee = 170.0
-        self.app['configuration']['2005'].ict_entre_fee = 180.0
+        self.app['configuration']['2004'].ict_entre_fee = 4170.0
+        self.app['configuration']['2005'].ict_entre_fee = 2180.0
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(error, u'Pay ICT fee(s) first.')
@@ -77 +77 @@
         self.assertEqual(payment.p_level, 200)
         self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 16000.0)
+        self.assertEqual(payment.amount_auth, 2180.0)
         payment.p_state = 'paid'
         self.student['payments']['any_key'] = payment
@@ -91 +91 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 16000.0)
+        self.assertEqual(payment.amount_auth, 4170.0)
         payment.p_state = 'paid'
         self.student['payments']['any_key_2'] = payment

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

@@ -221 +221 @@
             else:
                 return _(u'No bed allocated.'), None
-        elif category == 'ict_entre':
-            amount = 11000.0
-            if student['studycourse'].entry_session < 2018:
-                amount = 16000.0
         else:
             fee_name = category + '_fee'