Changeset 15391 for main

Timestamp:

12 Apr 2019, 06:13:35 (6 years ago)

Author:

Henrik Bettermann

Message:

WAeAC does not have share in 1st agreement acceptance.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/interswitch

Files:

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

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

@@ -391 +391 @@
                 else:
                     self.pay_item_id = '104'
+                provider_amt = 0.0
                 xmldict['institution_acct'] = '1014847058'
                 xmldict['institution_bank_id'] = '7'
@@ -416 +417 @@
 <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="Matriculation Gown Fee" item_amt="%(gown_fee_amt)d" bank_id="117" acct_num="1010827641" />
-<item_detail item_id="3" item_name="AAU File-Lapel Fee" item_amt="%(aaue_lf_fee_amt)d" bank_id="117" acct_num="1010827641" />
+<item_detail item_id="3" item_name="AAU File-Lapel Fee" item_amt="%(aaue_lf_fee_amt)d" bank_id="117" acct_num="1010827641" />""" % xmldict
+                if contr_agreement_student(student) == 'second':
+                    xmltext += """"
 <item_detail item_id="4" 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
+                else:
+                    xmltext += """"
 </item_details>
 </payment_item_detail>""" % xmldict
@@ -438 +445 @@
                 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_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
-
+<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" />"""
+                if contr_agreement_student(student) == 'second':
+                        xmltext += """"
+<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
+                else:
+                        xmltext += """"
+</item_details>
+</payment_item_detail>""" % xmldict
 
         # Union Dues

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

@@ -310 +310 @@
         self.assertTrue(
             'item_name="Acceptance Fee Plus" '
-            'item_amt="3850000" bank_id="7" '
+            'item_amt="4000000" bank_id="7" '
             'acct_num="1014847058"' in self.browser.contents)