Changeset 12188 for main/waeup.fceokene/trunk/src
- Timestamp:
- 10 Dec 2014, 09:33:27 (10 years ago)
- Location:
- main/waeup.fceokene/trunk/src/waeup/fceokene
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.fceokene/trunk/src/waeup/fceokene/interswitch/tests.py
r11932 r12188 65 65 self.browser.contents) 66 66 self.assertTrue( 67 '<span>1 3245.0</span>' in self.browser.contents)67 '<span>14975.0</span>' in self.browser.contents) 68 68 self.payment_url = self.browser.url 69 69 … … 94 94 self.browser.contents) 95 95 self.assertTrue( 96 '<input type="hidden" name="amount" value="1 324500" />'97 in self.browser.contents) 98 self.assertTrue( 99 'item_name="School Fee" item_amt="1 009500" bank_id="117" acct_num="1012044015"'96 '<input type="hidden" name="amount" value="1497500" />' 97 in self.browser.contents) 98 self.assertTrue( 99 'item_name="School Fee" item_amt="1182500" bank_id="117" acct_num="1012044015"' 100 100 in self.browser.contents) 101 101 self.assertTrue( … … 165 165 self.browser.contents) 166 166 self.assertTrue( 167 '<span> 4150.0</span>' in self.browser.contents)167 '<span>5150.0</span>' in self.browser.contents) 168 168 # p_item is not unveiled 169 169 self.assertFalse('Hall 1, Block A, Room 101, Bed A' … … 186 186 self.browser.contents) 187 187 self.assertTrue( 188 '<input type="hidden" name="amount" value=" 415000" />'189 in self.browser.contents) 190 self.assertTrue( 191 'item_name="Hostel Maintenance Fee" item_amt=" 400000" bank_id="117" acct_num="1012044132"'188 '<input type="hidden" name="amount" value="515000" />' 189 in self.browser.contents) 190 self.assertTrue( 191 'item_name="Hostel Maintenance Fee" item_amt="500000" bank_id="117" acct_num="1012044132"' 192 192 in self.browser.contents) 193 193 # BT does nor charge a fee for maintenance fee -
main/waeup.fceokene/trunk/src/waeup/fceokene/students/tests/test_browser.py
r12187 r12188 228 228 self.assertEqual(payment.p_level, 100) 229 229 self.assertEqual(payment.p_session, 2004) 230 self.assertEqual(payment.amount_auth, 1 3245.0)230 self.assertEqual(payment.amount_auth, 14975.0) 231 231 self.assertEqual(payment.p_item, u'CERT1') 232 232 self.assertEqual(error, None) … … 241 241 self.assertEqual(payment.p_level, 200) 242 242 self.assertEqual(payment.p_session, 2005) 243 self.assertEqual(payment.amount_auth, 1 2295.0)243 self.assertEqual(payment.amount_auth, 14025.0) 244 244 self.assertEqual(payment.p_item, u'CERT1') 245 245 self.assertEqual(error, None) … … 281 281 self.assertEqual(payment.p_level, 100) 282 282 self.assertEqual(payment.p_session, 2004) 283 self.assertEqual(payment.amount_auth, 4150.0)283 self.assertEqual(payment.amount_auth, 5150.0) 284 284 self.assertEqual(payment.p_item, u'My bed coordinates') 285 285 self.assertEqual(error, None) -
main/waeup.fceokene/trunk/src/waeup/fceokene/students/utils.py
r12187 r12188 140 140 amount = 2500.0 #removed interswitch fee 141 141 else: 142 amount = 4000.0 #removed interswitch fee142 amount = 5000.0 #removed interswitch fee 143 143 elif category == 'clearance': 144 144 amount = academic_session.clearance_fee … … 181 181 if student.current_level == 10 and student.state == CLEARED: 182 182 if student.depcode in ARTS: 183 amount = 1 5500184 else: 185 amount = 1 6000183 amount = 17500 184 else: 185 amount = 18000 186 186 # NCE I fresh 187 187 elif student.current_level == 100 and student.state == CLEARED: 188 188 if student.depcode in ARTS: 189 amount = 1 2620190 else: 191 amount = 1 3095189 amount = 14325 190 else: 191 amount = 14825 192 192 # NCE II 193 193 elif student.current_level in (100, 110, 120) and \ 194 194 student.state == RETURNING: 195 195 if student.depcode in ARTS: 196 amount = 1 1670197 else: 198 amount = 1 2145196 amount = 13375 197 else: 198 amount = 13875 199 199 # NCE III 200 200 elif student.current_level in (200, 210, 220): 201 201 if student.depcode in ARTS: 202 amount = 1 1670203 else: 204 amount = 1 2145202 amount = 13375 203 else: 204 amount = 13875 205 205 # NCE III repeater 206 206 elif student.current_level in (300, 310, 320) and \ 207 207 student.current_verdict == 'O': 208 208 if student.depcode in ARTS: 209 amount = 9770210 else: 211 amount = 1 0245209 amount = 11475 210 else: 211 amount = 11975 212 212 # NCE III spillover 213 213 elif student.current_level in (300, 310, 320) and \ 214 214 student.current_verdict == 'B': 215 215 if student.depcode in ARTS: 216 amount = 9770217 else: 218 amount = 1 0245216 amount = 11975 217 else: 218 amount = 11975 219 219 # NCE III second spillover 220 220 elif student.current_level in (400, 410, 420) and \ 221 221 student.current_verdict == 'B': 222 222 if student.depcode in ARTS: 223 amount = 9770224 else: 225 amount = 1 0245223 amount = 11975 224 else: 225 amount = 11975 226 226 else: 227 227 if student.current_level == 100 and student.state == CLEARED:
Note: See TracChangeset for help on using the changeset viewer.