Changeset 11793 for main/waeup.kwarapoly
- Timestamp:
- 14 Sep 2014, 15:53:20 (10 years ago)
- Location:
- main/waeup.kwarapoly/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.kwarapoly/trunk/CHANGES.txt
r11792 r11793 4 4 1.2dev (unreleased) 5 5 =================== 6 7 * Until 14/9/2014 we have not sent split amount data for pre applications. 8 To compenstate the loss in 2014 we temporarily double the split amounts 9 See ticket 75. 6 10 7 11 * Add jamb_age to ICustomUGApplicant. -
main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/browser.py
r11791 r11793 247 247 xmldict['institution_acct'] = '2013910271' 248 248 xmldict['institution_bank_id'] = '8' 249 self.pay_item_id = '104' 250 provider_amt = 0.0 251 dalash_amt = 0.0 249 # Until 14/9/2014 we have not sent split amount data for pre applications. 250 # To compenstate the loss we temporarily double the split amounts. 251 # See ticket 75. 252 provider_amt = 600.0 253 dalash_amt = 400.0 252 254 elif self.applicant.applicant_id.startswith('pre'): 253 255 # changed for prejambites from FBN '2013910271' to GTBank '0106259811' 254 256 xmldict['institution_acct'] = '0106259811' 255 257 xmldict['institution_bank_id'] = '10' 256 provider_amt = 0.0 257 dalash_amt = 0.0 258 # Until 14/9/2014 we have not sent split amount data for pre applications. 259 # To compenstate the loss we temporarily double the split amounts. 260 # See ticket 75. 261 provider_amt = 600.0 262 dalash_amt = 400.0 258 263 elif self.applicant.applicant_id.startswith('special'): 259 264 if self.context.p_category in SPECIAL_PAYMENT_PARAMS.keys(): … … 287 292 # Interswitch amount is not part of the xml data 288 293 289 if not self.applicant.applicant_id.startswith('pre'): 290 xmltext = """<payment_item_detail> 294 xmltext = """<payment_item_detail> 291 295 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s"> 292 296 <item_detail item_id="1" item_name="%(institution_item_name)s" item_amt="%(institution_amt)d" bank_id="%(institution_bank_id)s" acct_num="%(institution_acct)s" /> 293 297 <item_detail item_id="2" item_name="Dalash" item_amt="%(dalash_amt)d" bank_id="117" acct_num="1013196791" /> 294 298 <item_detail item_id="3" item_name="%(provider_item_name)s" item_amt="%(provider_amt)d" bank_id="%(provider_bank_id)s" acct_num="%(provider_acct)s" /> 295 </item_details>296 </payment_item_detail>""" % xmldict297 298 else:299 xmltext = """<payment_item_detail>300 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s">301 <item_detail item_id="1" item_name="%(institution_item_name)s" item_amt="%(institution_amt)d" bank_id="%(institution_bank_id)s" acct_num="%(institution_acct)s" />302 299 </item_details> 303 300 </payment_item_detail>""" % xmldict -
main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/tests.py
r11791 r11793 563 563 self.assertTrue( 564 564 '<item_detail item_id="1" item_name="Application Fee" ' 565 'item_amt="303300" bank_id="10" acct_num="0106259811" />' 566 in self.browser.contents) 567 # No 'commission', no provider fee 568 self.assertFalse('Dalash' in self.browser.contents) 569 self.assertFalse('BT Education' in self.browser.contents) 565 'item_amt="203300" bank_id="10" acct_num="0106259811" />' 566 in self.browser.contents) 567 # No 'commission', no provider fee in 2013 568 #self.assertFalse('Dalash' in self.browser.contents) 569 #self.assertFalse('BT Education' in self.browser.contents) 570 # Comission is charged from 14/09/2014 571 self.assertTrue( 572 '<item_detail item_id="2" item_name="Dalash" item_amt="40000" ' 573 'bank_id="117" acct_num="1013196791" />' 574 in self.browser.contents) 575 self.assertTrue( 576 '<item_detail item_id="3" item_name="BT Education" ' 577 'item_amt="60000" bank_id="117" acct_num="1010764827" />' 578 in self.browser.contents) 570 579 571 580 # prejambites fee goes to another account … … 578 587 self.assertTrue( 579 588 '<item_detail item_id="1" item_name="Application Fee" ' 580 'item_amt="303300" bank_id="8" acct_num="2013910271" />' 581 in self.browser.contents) 582 # No 'commission', no provider fee 583 self.assertFalse('Dalash' in self.browser.contents) 584 self.assertFalse('BT Education' in self.browser.contents) 589 'item_amt="203300" bank_id="8" acct_num="2013910271" />' 590 in self.browser.contents) 591 # No 'commission', no provider fee in 2013 592 #self.assertFalse('Dalash' in self.browser.contents) 593 #self.assertFalse('BT Education' in self.browser.contents) 594 # Comission is charged from 14/09/2014 595 self.assertTrue( 596 '<item_detail item_id="2" item_name="Dalash" item_amt="40000" ' 597 'bank_id="117" acct_num="1013196791" />' 598 in self.browser.contents) 599 self.assertTrue( 600 '<item_detail item_id="3" item_name="BT Education" ' 601 'item_amt="60000" bank_id="117" acct_num="1010764827" />' 602 in self.browser.contents) 585 603 586 604
Note: See TracChangeset for help on using the changeset viewer.