Changeset 13407 for main/waeup.aaue/trunk/src/waeup

Timestamp:

7 Nov 2015, 12:11:10 (9 years ago)

Author:

Henrik Bettermann

Message:

We can use dynamic_gateway_amt everywhere.

File:

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

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

@@ -139 +139 @@
         current_session = student['studycourse'].current_session
         try:
-            academic_session = grok.getSite()['configuration'][str(current_session)]
+            academic_session = grok.getSite()[
+                'configuration'][str(current_session)]
         except KeyError:
-            self.flash(_(u'Session configuration object is not available.'), type='danger')
+            self.flash(_(u'Session configuration object is not available.'),
+                       type='danger')
             self.redirect(self.url(self.context, '@@index'))
             return
@@ -219 +221 @@
                     - joint_venture_amt
                     - aaue_share_amt
-                    - (student_union_due_amt - GATEWAY_AMT)
-                    - (student_welfare_assurance_amt - GATEWAY_AMT)
-                    - GATEWAY_AMT)
+                    - (student_union_due_amt - dynamic_gateway_amt(self.context.amount_auth))
+                    - (student_welfare_assurance_amt - dynamic_gateway_amt(self.context.amount_auth))
+                    - dynamic_gateway_amt(self.context.amount_auth))
                 xmltext = """<payment_item_detail>
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">
@@ -239 +241 @@
                     - joint_venture_amt
                     - aaue_share_amt
-                    - GATEWAY_AMT)
+                    - dynamic_gateway_amt(self.context.amount_auth))
                 xmltext = """<payment_item_detail>
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">
@@ -274 +276 @@
                 xmldict['institution_amt'] = 100 * (
                     self.context.amount_auth
-                    - (gown_fee_amt - GATEWAY_AMT)
-                    - (aaue_fl_fee_amt - GATEWAY_AMT)
-                    - GATEWAY_AMT)
+                    - (gown_fee_amt - dynamic_gateway_amt(self.context.amount_auth))
+                    - (aaue_fl_fee_amt - dynamic_gateway_amt(self.context.amount_auth))
+                    - dynamic_gateway_amt(self.context.amount_auth))
                 xmltext = """<payment_item_detail>
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">
@@ -289 +291 @@
                 xmldict['institution_amt'] = 100 * (
                     self.context.amount_auth
-                    - GATEWAY_AMT)
+                    - dynamic_gateway_amt(self.context.amount_auth))
                 xmltext = """<payment_item_detail>
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">