Changeset 9617 for main

Timestamp:

11 Nov 2012, 17:08:27 (12 years ago)

Author:

Henrik Bettermann

Message:

Insert bank account details for maint fee. pay_item:id is still missing.

Location:

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

Files:

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

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

@@ -233 +233 @@
         xmldict['institution_item_name'] = self.category
         xmldict['institution_name'] = INSTITUTION_NAME
-        xmldict['institution_amt'] = 100 * self.context.amount_auth
+        xmldict['institution_amt'] = 100 * (self.context.amount_auth -300)
         xmldict['dalash_amt'] = 0
         self.pay_item_id = '000'
@@ -259 +259 @@
                 self.context.amount_auth - 1200 - 300 - 1800)
 
+        elif 'maintenance' in self.context.p_category:
+            self.pay_item_id = '000'
+            xmldict['institution_acct'] = "0039050937"
+            xmldict['institution_bank_id'] = '31'
+
         hashargs = (
             self.context.p_id +
@@ -269 +274 @@
 
         # Interswitch amount is not part of the xml data
-        xmltext = """<payment_item_detail>
+
+        if self.context.p_category == 'schoolfee':
+            xmltext = """<payment_item_detail>
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)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" />
@@ -276 +283 @@
 </item_details>
 </payment_item_detail>""" % xmldict
+
+        elif 'maintenance' in self.context.p_category:
+            xmltext = """<payment_item_detail>
+<item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)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_details>
+</payment_item_detail>""" % xmldict
+
         self.xml_data = """<input type="hidden" name="xml_data" value='%s'  />""" % xmltext
         return

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

@@ -171 +171 @@
             self.browser.contents)
         self.assertMatches(
-            '...item_name="Hostel Maintenance Fee" item_amt="98700" bank_id="0" acct_num="0000000000000"...',
+            '...item_name="Hostel Maintenance Fee" item_amt="68700" bank_id="31" acct_num="0039050937"...',
             self.browser.contents)
         # BT does nor charge a fee for maintenance fee