Changeset 13409 for main

Timestamp:

7 Nov 2015, 22:18:21 (9 years ago)

Author:

Henrik Bettermann

Message:

Subtract gateway amount from additional 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

@@ -189 +189 @@
                 joint_venture_amt = 1100.0
                 aaue_share_amt = 1000.0
-                student_union_due_amt = academic_session.union_fee
-                student_welfare_assurance_amt = academic_session.welfare_fee
+                student_union_due_amt = academic_session.union_fee - \
+                    dynamic_gateway_amt(academic_session.union_fee)
+                student_welfare_assurance_amt = academic_session.welfare_fee - \
+                    dynamic_gateway_amt(academic_session.welfare_fee)
                 xmldict['institution_bank_id'] = '7'
                 xmldict['institution_acct'] = '1014847058'
@@ -202 +204 @@
                 joint_venture_amt = 1000.0
                 aaue_share_amt = 1500.0
-                student_union_due_amt = academic_session.union_fee
-                student_welfare_assurance_amt = academic_session.welfare_fee
+                student_union_due_amt = academic_session.union_fee - \
+                    dynamic_gateway_amt(academic_session.union_fee)
+                student_welfare_assurance_amt = academic_session.welfare_fee - \
+                    dynamic_gateway_amt(academic_session.welfare_fee)
                 xmldict['institution_bank_id'] = '117'
                 xmldict['institution_acct'] = '1010827641'
@@ -220 +224 @@
                     - joint_venture_amt
                     - aaue_share_amt
-                    - (student_union_due_amt - dynamic_gateway_amt(self.context.amount_auth))
-                    - (student_welfare_assurance_amt - dynamic_gateway_amt(self.context.amount_auth))
+                    - student_union_due_amt
+                    - student_welfare_assurance_amt
                     - dynamic_gateway_amt(self.context.amount_auth))
                 xmltext = """<payment_item_detail>
@@ -269 +273 @@
             if self.context.p_category == 'clearance_incl':
                 # Clearance including additional fees
-                gown_fee_amt = academic_session.matric_gown_fee
-                aaue_fl_fee_amt = academic_session.lapel_fee
+                gown_fee_amt = academic_session.matric_gown_fee - \
+                    dynamic_gateway_amt(academic_session.matric_gown_fee)
+                aaue_fl_fee_amt = academic_session.lapel_fee - \
+                    dynamic_gateway_amt(academic_session.lapel_fee)
                 xmldict['gown_fee_amt'] = 100 * gown_fee_amt
                 xmldict['aaue_fl_fee_amt'] = 100 * aaue_fl_fee_amt
                 xmldict['institution_amt'] = 100 * (
                     self.context.amount_auth
-                    - (gown_fee_amt - dynamic_gateway_amt(self.context.amount_auth))
-                    - (aaue_fl_fee_amt - dynamic_gateway_amt(self.context.amount_auth))
+                    - gown_fee_amt
+                    - aaue_fl_fee_amt
                     - dynamic_gateway_amt(self.context.amount_auth))
                 xmltext = """<payment_item_detail>