Changeset 17937 for main/kofacustom.unidel/trunk/src/kofacustom

Timestamp:

4 Oct 2024, 23:16:34 (5 weeks ago)

Author:

Henrik Bettermann

Message:

Fix xml.

Location:

main/kofacustom.unidel/trunk/src/kofacustom/unidel/interswitch

Files:

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

main/kofacustom.unidel/trunk/src/kofacustom/unidel/interswitch/browser.py

@@ -177 +177 @@
         xmldict['institution_amt'] = 100 * self.context.net_amt
         xmldict['item_id'] = 1
-        xmltext = """<payment_item_detail>
+        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="%(item_id)s" item_name="%(institution_item_name)s" item_amt="%(institution_amt)d" bank_id="%(institution_bank_id)s" acct_num="%(institution_acct)s" />
@@ -183 +184 @@
         if provider_amt:
             xmldict['item_id'] += 1
-            xmltext += """
-<item_detail item_id="%(item_id)s" item_name="%(provider_item_name)s" item_amt="%(provider_amt)d" bank_id="%(provider_bank_id)s" acct_num="%(provider_acct)s" />
+            xmltext += """<item_detail item_id="%(item_id)s" item_name="%(provider_item_name)s" item_amt="%(provider_amt)d" bank_id="%(provider_bank_id)s" acct_num="%(provider_acct)s" />
 """ % xmldict
         if tech_fee:
             xmldict['item_id'] += 1
-            xmltext += """<item_detail item_id="%(item_id)s" item_name="Technology Fee" item_amt="%(tech_fee)d" bank_id="%(tech_bank_id)s" acct_num="%(tech_acct)s"/>
+            xmltext += """<item_detail item_id="%(item_id)s" item_name="Technology Fee" item_amt="%(tech_fee)d" bank_id="%(tech_bank_id)s" acct_num="%(tech_acct)s" />
 """ % xmldict
         if union_due:
             xmldict['item_id'] += 1
-            xmltext += """<item_detail item_id="%(item_id)s" item_name="Student Union Due" item_amt="%(union_due)d" bank_id="%(union_bank_id)s" acct_num="%(union_acct)s"/>
-</item_details>
-</payment_item_detail>""" % xmldict
-        self.xml_data = """<input type="hidden" name="xml_data" value='%s'  />""" % xmltext
+            xmltext += """<item_detail item_id="%(item_id)s" item_name="Student Union Due" item_amt="%(union_due)d" bank_id="%(union_bank_id)s" acct_num="%(union_acct)s" />
+""" % xmldict
+        xmltext +="""</item_details>
+</payment_item_detail>
+"""
+        self.xml_data = """<input type="hidden" name="xml_data" value='%s' />""" % xmltext
         self.context.provider_amt = provider_amt
         self.amount_auth = int(100 * self.context.amount_auth)

main/kofacustom.unidel/trunk/src/kofacustom/unidel/interswitch/tests.py

@@ -84 +84 @@
             self.browser.contents)
         self.assertTrue(
-            '<item_detail item_id="4" item_name="Student Union Due" item_amt="150000" bank_id="117" acct_num="1011438901"/>' in
+            '<item_detail item_id="4" item_name="Student Union Due" item_amt="150000" bank_id="117" acct_num="1011438901" />' in
             self.browser.contents)