Changeset 14074

Timestamp:

12 Aug 2016, 07:32:44 (8 years ago)

Author:

Henrik Bettermann

Message:

prejambites same as pre

Location:

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch

Files:

• browser.py (modified) (2 diffs)
• tests.py (modified) (1 diff)

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/browser.py

@@ -253 +253 @@
             xmldict['institution_acct'] = '0106259811'
             xmldict['institution_bank_id'] = '10'
-        elif self.applicant.applicant_id.startswith('prejambites') or \
-            self.applicant.applicant_id.startswith('putme'):
+        elif self.applicant.applicant_id.startswith('putme'):
             xmldict['institution_acct'] = '0106259811'
             xmldict['institution_bank_id'] = '10'
@@ -304 +303 @@
 </payment_item_detail>""" % xmldict
 
-        if self.applicant.applicant_id.startswith('pre') \
-            and not self.applicant.applicant_id.startswith('prejambites'):
+        if self.applicant.applicant_id.startswith('pre'):
             xmltext = """<payment_item_detail>
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s">

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/tests.py

@@ -597 +597 @@
         self.assertTrue(
             '<item_detail item_id="1" item_name="Application" '
-            'item_amt="253300" bank_id="10" acct_num="0106259811" />'
-            in self.browser.contents)
-        # No 'commission', no provider fee in 2013
-        #self.assertFalse('Dalash' in self.browser.contents)
+            'item_amt="303300" bank_id="10" acct_num="0106259811" />'
+            in self.browser.contents)
+        self.assertFalse('Dalash' in self.browser.contents)
         #self.assertFalse('BT Education' in self.browser.contents)
-        # Comission is charged from 14/09/2014
-        self.assertTrue(
-            '<item_detail item_id="2" item_name="Dalash" item_amt="20000" '
-            'bank_id="117" acct_num="1013196791" />'
-            in self.browser.contents)
-        self.assertTrue(
-            '<item_detail item_id="3" item_name="BT Education" '
-            'item_amt="30000" bank_id="117" acct_num="1010764827" />'
+        self.assertTrue(
+            '<item_detail item_id="2" item_name="BT Education" '
+            'item_amt="26250" bank_id="117" acct_num="1010764827" />'
             in self.browser.contents)
         self.assertTrue(