Changeset 17397 for main

Timestamp:

28 Apr 2023, 08:38:41 (17 months ago)

Author:

Henrik Bettermann

Message:

Pt students do not pay SUD.

Location:

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

Files:

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

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

@@ -74 +74 @@
         self.app['configuration']['2005'].union_fee = 1434.0
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
-        self.assertEqual(error, u'Pay Student Union and ICT fee(s) first.')
+        self.assertEqual(error, u'Pay ICT fee(s) first.')
         error, payment = utils.setPaymentDetails('ict_entre',self.student)
         self.assertEqual(error, None)
@@ -82 +82 @@
         payment.p_state = 'paid'
         self.student['payments']['any_key'] = payment
-        error, payment = utils.setPaymentDetails('union',self.student)
-        self.assertEqual(error, None)
-        self.assertEqual(payment.p_level, 200)
-        self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 1434.0)
-        payment.p_state = 'paid'
-        self.student['payments']['any_key_2'] = payment
+        #error, payment = utils.setPaymentDetails('union',self.student)
+        #self.assertEqual(error, None)
+        #self.assertEqual(payment.p_level, 200)
+        #self.assertEqual(payment.p_session, 2005)
+        #self.assertEqual(payment.amount_auth, 1434.0)
+        #payment.p_state = 'paid'
+        #self.student['payments']['any_key_2'] = payment
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(error, None)

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

@@ -92 +92 @@
         req_payments = ('ict_entre', 'logbook_combo','union')
         req_payments_titles = 'ICT, Student Union and Logbook'
-        # All ND and HND part time do not pay for LOGBOOK
+        # All ND and HND part time do not pay for logbook and union
         if student.current_mode.endswith('_pt'):
-            req_payments = ('ict_entre', 'union')
-            req_payments_titles = 'Student Union and ICT'
+            req_payments = ('ict_entre',)
+            req_payments_titles = 'ICT'
         # HND1 and HND2 full time do not pay for LOGBOOK
         elif student.current_mode == 'hnd_ft' and student.state in (