Changeset 15512 for main

Timestamp:

24 Jul 2019, 19:59:27 (5 years ago)

Author:

Henrik Bettermann

Message:

Account and technology fee changes according to ticket #580.

Location:

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

Files:

• interswitch/browser.py (modified) (2 diffs)
• students/browser.py (modified) (1 diff)

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

@@ -118 +118 @@
                 provider_amt = 1000.0
             if self.applicant.__parent__.prefix in ('trans', 'cert'):
+                self.institution_acct = '1010827641'
+                self.institution_bank_id = '117'
                 self.provider_bank_id = '10'
                 self.provider_acct = '0427773399'
+                if self.applicant.applicant_id[:5] in ('cert7', 'cert8'):
+                    provider_amt = 0.0
+                if self.applicant.applicant_id[:6] in ('trans5', 'trans6'):
+                    self.institution_acct = '5210006575'
+                    self.institution_bank_id = '5'
             elif self.applicant.applicant_id.startswith('bridge',): # easier to test
                 self.institution_acct = '1014847058'
                 self.institution_bank_id = '7'
-
         xmldict = {}
         xmldict['detail_ref'] = self.context.p_id
@@ -136 +142 @@
         xmldict['institution_amt'] = 100 * (
             self.context.amount_auth - provider_amt - GATEWAY_AMT)
+
         xmltext = """<payment_item_detail>
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)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
+
+        if provider_amt == 0.0:
+            xmltext = """<payment_item_detail>
+<item_details detail_ref="%(detail_ref)s" college="%(institution_name)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

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

@@ -438 +438 @@
         #        "Course registration has ended. "
         #        "Unregistration is disabled."), type="danger")
-        elif str(self.context.__parent__.current_level) != self.context.__name__:
+        if str(self.context.__parent__.current_level) != self.context.__name__:
             self.flash(_('This is not your current level.'), type="danger")
         elif self.context.student.state == REGISTERED: