Changeset 11932 for main/waeup.fceokene/trunk/src/waeup/fceokene/students
- Timestamp:
- 3 Nov 2014, 12:19:35 (10 years 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
r11920 r11932 128 128 self.assertMatches('...ticket created...', 129 129 self.browser.contents) 130 self.certificate.study_mode = 'nce_sw' 130 131 self.browser.open(self.payments_path + '/addop') 131 132 self.browser.getControl(name="form.p_category").value = ['third_semester'] … … 133 134 self.assertMatches('...could not be determined...', 134 135 self.browser.contents) 135 self.certificate.study_mode = 'nce_ sw'136 self.certificate.study_mode = 'nce_ft' 136 137 self.browser.open(self.payments_path + '/addop') 137 138 self.browser.getControl(name="form.p_category").value = ['third_semester'] … … 284 285 self.assertEqual(error, None) 285 286 286 self.certificate.study_mode = 'nce_sw'287 287 error, payment = utils.setPaymentDetails('third_semester',self.student) 288 288 self.assertEqual(payment.p_level, 100) 289 289 self.assertEqual(payment.p_session, 2004) 290 self.assertEqual(payment.amount_auth, 6913.0)290 self.assertEqual(payment.amount_auth, 7913.0) 291 291 self.assertEqual(payment.p_item, u'') 292 292 self.assertEqual(error, None) -
main/waeup.fceokene/trunk/src/waeup/fceokene/students/utils.py
r11920 r11932 147 147 except (AttributeError, TypeError): 148 148 return _('Study course data are incomplete.'), None 149 elif category == 'third_semester' and student.current_mode == 'nce_ sw':149 elif category == 'third_semester' and student.current_mode == 'nce_ft': 150 150 if student.depcode in ARTS: 151 amount = 5835151 amount = 6835 152 152 else: 153 amount = 6763153 amount = 7763 154 154 elif category == 'schoolfee': 155 155 try:
Note: See TracChangeset for help on using the changeset viewer.