Changeset 17397
- Timestamp:
- 28 Apr 2023, 08:38:41 (20 months ago)
- Location:
- main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students/tests/test_utils.py
r17391 r17397 74 74 self.app['configuration']['2005'].union_fee = 1434.0 75 75 error, payment = utils.setPaymentDetails('schoolfee',self.student) 76 self.assertEqual(error, u'Pay Student Union andICT fee(s) first.')76 self.assertEqual(error, u'Pay ICT fee(s) first.') 77 77 error, payment = utils.setPaymentDetails('ict_entre',self.student) 78 78 self.assertEqual(error, None) … … 82 82 payment.p_state = 'paid' 83 83 self.student['payments']['any_key'] = payment 84 error, payment = utils.setPaymentDetails('union',self.student)85 self.assertEqual(error, None)86 self.assertEqual(payment.p_level, 200)87 self.assertEqual(payment.p_session, 2005)88 self.assertEqual(payment.amount_auth, 1434.0)89 payment.p_state = 'paid'90 self.student['payments']['any_key_2'] = payment84 #error, payment = utils.setPaymentDetails('union',self.student) 85 #self.assertEqual(error, None) 86 #self.assertEqual(payment.p_level, 200) 87 #self.assertEqual(payment.p_session, 2005) 88 #self.assertEqual(payment.amount_auth, 1434.0) 89 #payment.p_state = 'paid' 90 #self.student['payments']['any_key_2'] = payment 91 91 error, payment = utils.setPaymentDetails('schoolfee',self.student) 92 92 self.assertEqual(error, None) -
main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students/utils.py
r17391 r17397 92 92 req_payments = ('ict_entre', 'logbook_combo','union') 93 93 req_payments_titles = 'ICT, Student Union and Logbook' 94 # All ND and HND part time do not pay for LOGBOOK94 # All ND and HND part time do not pay for logbook and union 95 95 if student.current_mode.endswith('_pt'): 96 req_payments = ('ict_entre', 'union')97 req_payments_titles = ' Student Union andICT'96 req_payments = ('ict_entre',) 97 req_payments_titles = 'ICT' 98 98 # HND1 and HND2 full time do not pay for LOGBOOK 99 99 elif student.current_mode == 'hnd_ft' and student.state in (
Note: See TracChangeset for help on using the changeset viewer.