Changeset 13653 for main/waeup.kwarapoly
- Timestamp:
- 7 Feb 2016, 07:32:25 (9 years ago)
- Location:
- main/waeup.kwarapoly/trunk/src/waeup/kwarapoly
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/browser.py
r13591 r13653 125 125 xmldict['institution_acct'] = "0106259811" 126 126 xmldict['institution_bank_id'] = "10" 127 if self.context.p_category == 'schoolfee': 127 if self.context.p_category == 'schoolfee' \ 128 or self.context.p_category.startswith('carryover'): 128 129 self.pay_item_id = '101' 129 130 dalash_amt = 1800.0 -
main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/tests.py
r13461 r13653 248 248 self.browser.contents) 249 249 self.assertTrue( 250 'item_name=" School Fee" item_amt="270000" bank_id="10" acct_num="0106259811"' in250 'item_name="One Carry-Over" item_amt="270000" bank_id="10" acct_num="0106259811"' in 251 251 self.browser.contents) 252 252 self.assertTrue( -
main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/tests/test_browser.py
r13535 r13653 268 268 self.assertEqual(payment.p_session, 2004) 269 269 self.assertEqual(payment.amount_auth, 6000.0) 270 self.assertEqual(payment.p_item, u' 1 CarryOver')271 self.assertEqual(payment.p_category, ' schoolfee')270 self.assertEqual(payment.p_item, u'One Carry-Over') 271 self.assertEqual(payment.p_category, 'carryover1') 272 272 self.assertEqual(error, None) 273 273 … … 276 276 self.assertEqual(payment.p_session, 2004) 277 277 self.assertEqual(payment.amount_auth, 10000.0) 278 self.assertEqual(payment.p_item, u' 2 CarryOvers')279 self.assertEqual(payment.p_category, ' schoolfee')278 self.assertEqual(payment.p_item, u'Two Carry-Overs') 279 self.assertEqual(payment.p_category, 'carryover2') 280 280 self.assertEqual(error, None) 281 281 … … 284 284 self.assertEqual(payment.p_session, 2004) 285 285 self.assertEqual(payment.amount_auth, 15000.0) 286 self.assertEqual(payment.p_item, u' 3 CarryOvers')287 self.assertEqual(payment.p_category, ' schoolfee')286 self.assertEqual(payment.p_item, u'Three Carry-Overs') 287 self.assertEqual(payment.p_category, 'carryover3') 288 288 self.assertEqual(error, None) 289 289 -
main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/utils.py
r13536 r13653 262 262 p_item = unicode(p_item) 263 263 # Now we change the category to reduce the number of categories. 264 category = 'schoolfee' 264 # Disabled on 2016/02/04 265 #category = 'schoolfee' 265 266 if self._isPaymentDisabled(p_session, category, student): 266 267 return _('Payment temporarily disabled.'), None -
main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/utils/utils.py
r13278 r13653 61 61 PAYMENT_CATEGORIES = { 62 62 'schoolfee': 'School Fee', 63 'carryover1': ' 1 CarryOver',64 'carryover2': ' 2 CarryOvers',65 'carryover3': ' 3 CarryOvers',63 'carryover1': 'One Carry-Over', 64 'carryover2': 'Two Carry-Overs', 65 'carryover3': 'Three Carry-Overs', 66 66 'clearance': 'Acceptance', 67 67 'bed_allocation': 'Bed Allocation', … … 105 105 SELECTABLE_PAYMENT_CATEGORIES = { 106 106 'schoolfee': 'School Fee', 107 'carryover1': 'One Carry Over',108 'carryover2': 'Two Carry Overs',109 'carryover3': 'Three Carry Overs',107 'carryover1': 'One Carry-Over', 108 'carryover2': 'Two Carry-Overs', 109 'carryover3': 'Three Carry-Overs', 110 110 'hostel_maintenance': 'Hostel Maintenance', 111 111 'certificate': 'ND Certificate',
Note: See TracChangeset for help on using the changeset viewer.