Changeset 10142

Timestamp:

2 May 2013, 14:54:27 (12 years ago)

Author:

Henrik Bettermann

Message:

Remove dalash item_detail.

Location:

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

Files:

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

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

@@ -221 +221 @@
             self.context.creation_date, tz).strftime("%Y-%m-%d %H:%M:%S %Z")
         self.site_redirect_url = self.url(self.context, 'request_webservice')
-        provider_amt = 250.0
-        dalash_amt = 250.0
+        provider_amt = 500.0
         if self.applicant.applicant_id.startswith('hnd'):
             xmldict['institution_acct'] = '7000016463'
@@ -232 +231 @@
             xmldict['institution_acct'] = '00000000000'
             xmldict['institution_bank_id'] = '00'
-        xmldict['dalash_amt'] = 100 * dalash_amt
         xmldict['detail_ref'] = self.context.p_id
         xmldict['provider_amt'] = 100 * provider_amt
@@ -239 +237 @@
         xmldict['provider_item_name'] = PROVIDER_ITEM_NAME
         xmldict['institution_amt'] = 100 * (
-            self.context.amount_auth - provider_amt - GATEWAY_AMT - dalash_amt)
+            self.context.amount_auth - provider_amt - GATEWAY_AMT)
         xmldict['institution_item_name'] = self.context.p_category
         xmldict['institution_name'] = INSTITUTION_NAME
@@ -256 +254 @@
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s">
 <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" />
-<item_detail item_id="2" item_name="Dalash" item_amt="%(dalash_amt)d" bank_id="117" acct_num="1013196791" />
-<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" />
+<item_detail item_id="2" item_name="%(provider_item_name)s" item_amt="%(provider_amt)d" bank_id="%(provider_bank_id)s" acct_num="%(provider_acct)s" />
 </item_details>
 </payment_item_detail>""" % xmldict
@@ -263 +260 @@
         self.context.provider_amt = provider_amt
         self.context.gateway_amt = GATEWAY_AMT
-        self.context.thirdparty_amt = dalash_amt
         return
 

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

@@ -357 +357 @@
             'item_amt="253300" bank_id="9" acct_num="7000016463" />'
             in self.browser.contents)
-
+        self.assertTrue(
+            '<item_detail item_id="2" item_name="BT Education" '
+            'item_amt="50000" bank_id="117" acct_num="1010764827" />
+            in self.browser.contents)