Changeset 17734 for main/waeup.fceokene/trunk/src/waeup/fceokene/students
- Timestamp:
- 4 Apr 2024, 12:19:05 (9 months ago)
- Location:
- main/waeup.fceokene/trunk/src/waeup/fceokene/students
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.fceokene/trunk/src/waeup/fceokene/students/tests/test_browser.py
r17629 r17734 250 250 self.certificate.study_mode = 'ug_ft' 251 251 error, payment = utils.setPaymentDetails('schoolfee',self.student) 252 self.assertEqual(payment.amount_auth, 70700)252 self.assertEqual(payment.amount_auth, 96700) 253 253 self.assertEqual(error, None) 254 254 # UG cleared students pay 87200 255 255 IWorkflowState(self.student).setState('cleared') 256 256 error, payment = utils.setPaymentDetails('schoolfee',self.student) 257 self.assertEqual(payment.amount_auth, 87200)257 self.assertEqual(payment.amount_auth, 126200) 258 258 self.assertEqual(error, None) 259 259 -
main/waeup.fceokene/trunk/src/waeup/fceokene/students/utils.py
r17706 r17734 151 151 if student.state != CLEARED: 152 152 return _('You are not a fresh student.'), None 153 if category == 'schoolfee_ug_new': 154 if not student.current_mode.startswith('ug'): 155 return _('You are not a UG student.'), None 156 if student.state != CLEARED: 157 return _('You are not a fresh student.'), None 158 if category == 'schoolfee_ug_ret': 159 if not student.current_mode.startswith('ug'): 160 return _('You are not a UG student.'), None 161 if student.state != RETURNING: 162 return _('You are not a returning student.'), None 153 163 if category == 'schoolfee_third': 154 164 if not student.current_mode == 'nce_ft' \ … … 188 198 # UG 189 199 elif student.current_mode == 'ug_ft': 190 if student.state == CLEARED: 191 amount = 87200 200 if category == 'schoolfee_ug_new': 201 # conditions checked above 202 amount = 63200 203 elif category == 'schoolfee_ug_ret': 204 # conditions checked above 205 amount = 48700 206 elif student.state == CLEARED: 207 amount = 126200 192 208 # Introducing repeater fee for 'ug_ft' for 1st time 193 209 # on 15/03/2016 194 elif student.current_verdict == 'O':195 amount = 70700210 #elif student.current_verdict == 'O': 211 # amount = 96700 196 212 else: 197 amount = 70700213 amount = 96700 198 214 # NCE 199 215 elif not student.current_mode.endswith('_sw'):
Note: See TracChangeset for help on using the changeset viewer.