Changeset 14086 for main

Timestamp:

18 Aug 2016, 06:01:01 (8 years ago)

Author:

Henrik Bettermann

Message:

Two different acounts for student union fees.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py (modified) (4 diffs)

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

@@ -212 +212 @@
                 xmldict['institution_bank_id'] = '7'
                 xmldict['institution_acct'] = '1014847058'
+                xmldict['student_union_bank_id'] = '31'
+                xmldict['student_union_acct'] = '0051005007'
                 if student.current_mode == 'found':
                     self.pay_item_id = '103'
@@ -227 +229 @@
                 xmldict['institution_bank_id'] = '117'
                 xmldict['institution_acct'] = '1010827641'
+                xmldict['student_union_bank_id'] = '123'
+                xmldict['student_union_acct'] = '1006360118'
                 self.pay_item_id = '107'
                 if student.is_postgrad:
@@ -261 +265 @@
 <item_detail item_id="3" item_name="Joint Venture" item_amt="%(joint_venture_amt)d" bank_id="51" acct_num="5060023759" />
 <item_detail item_id="4" item_name="AAUE Share" item_amt="%(aaue_share_amt)d" bank_id="51" acct_num="5060020947" />
-<item_detail item_id="5" item_name="Student Union" item_amt="%(student_union_due_amt)d" bank_id="31" acct_num="0051005007" />
+<item_detail item_id="5" item_name="Student Union" item_amt="%(student_union_due_amt)d" bank_id="%(student_union_bank_id)s" acct_num="%(student_union_acct)s" />
 <item_detail item_id="6" item_name="Student Welfare Assurance" item_amt="%(student_welfare_assurance_amt)d" bank_id="123" acct_num="1006407792" />
 </item_details>
@@ -333 +337 @@
         elif self.context.p_category == 'union':
             self.pay_item_id = '103'
-            xmldict['institution_acct'] = '0051005007'
-            xmldict['institution_bank_id'] = '31'
+            if contr_agreement_student(student) == 'first':
+                # First agreement
+                xmldict['institution_bank_id'] = '123'
+                xmldict['institution_acct'] = '1006360118'
+            else:
+                # Second agreement
+                xmldict['institution_acct'] = '0051005007'
+                xmldict['institution_bank_id'] = '31'
             xmldict['institution_amt'] = 100 * (
                 gateway_net_amt(self.context.amount_auth))