Changeset 10952 for main/waeup.aaua/trunk/src/waeup

Timestamp:

21 Jan 2014, 12:42:23 (11 years ago)

Author:

Henrik Bettermann

Message:

Split settlement (ICT charges) was supposed to be for first installment fees payment only.

Location:

main/waeup.aaua/trunk/src/waeup/aaua/interswitch

Files:

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

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

@@ -114 +114 @@
         if self.context.p_category in ('schoolfee', 'schoolfee_1', 'schoolfee_2'):
             provider_amt = 3000.0
+            if self.context.p_category == 'schoolfee_2':
+                provider_amt = 0.0
             xmldict['provider_amt'] = 100 * provider_amt
             self.pay_item_id = '10500'
@@ -137 +139 @@
         # Interswitch amount is not part of the xml data
 
-        if self.context.p_category in ('schoolfee', 'schoolfee_1', 'schoolfee_2'):
+        if self.context.p_category in ('schoolfee', 'schoolfee_1'):
             xmltext = """<payment_item_detail>
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">
@@ -144 +146 @@
 </item_details>
 </payment_item_detail>""" % xmldict
-
+        elif self.context.p_category  == 'schoolfee_2':
+            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
         self.context.provider_amt = provider_amt

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

@@ -108 +108 @@
             'item_name="School Fee" item_amt="685000" bank_id="120" acct_num="2461770000021"'
             in self.browser.contents)
+
+        self.certificate.ratio = 0.5
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['schoolfee_2']
+        self.browser.getControl("Create ticket").click()
+        ctrl = self.browser.getControl(name='val_id')
+        self.value = ctrl.options[2]
+        self.browser.getLink(self.value).click()
+        self.assertTrue(
+            '<span>5000.0</span>' in self.browser.contents)
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertTrue(
+            '<input type="hidden" name="amount" value="500000.0" />'
+            in self.browser.contents)
+        self.assertTrue(
+            'item_name="School Fee 2nd instalment" item_amt="485000" bank_id="120" acct_num="2461770000021"'
+            in self.browser.contents)