Changeset 16421 for main/kofacustom.dspg

Timestamp:

22 Mar 2021, 10:11:09 (4 years ago)

Author:

Henrik Bettermann

Message:

Add Microsoft Fee to schoolfee.

Location:

main/kofacustom.dspg/trunk/src/kofacustom/dspg

Files:

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

main/kofacustom.dspg/trunk/src/kofacustom/dspg/interswitch/browser.py

@@ -30 +30 @@
 from kofacustom.dspg.applicants.interfaces import ICustomApplicantOnlinePayment
 from kofacustom.dspg.interfaces import MessageFactory as _
+from kofacustom.dspg.students.utils import MICROSOFT_FEE
 
 PRODUCT_ID = '7269' # must be provided by Interswitch
@@ -145 +146 @@
                 tech_fee = 1200.0
                 if student.state == RETURNING:
-                    microsoft_fee = 7000.0
+                    microsoft_fee = MICROSOFT_FEE
             if student.faccode == 'SPAT':
                 xmldict['institution_acct'] = '1015220292'

main/kofacustom.dspg/trunk/src/kofacustom/dspg/students/tests/test_utils.py

@@ -110 +110 @@
         self.assertEqual(payment.p_level, 200)
         self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 9999.0)
+        self.assertEqual(payment.amount_auth, 16999.0) # now includes Microsoft Fee
 

main/kofacustom.dspg/trunk/src/kofacustom/dspg/students/utils.py

@@ -24 +24 @@
 from kofacustom.dspg.interfaces import MessageFactory as _
 
+MICROSOFT_FEE = 7000.0
 
 def local(student):
@@ -212 +213 @@
                         300, 310, 320, 330, 600, 610, 620, 630):
                         amount -= 7000
+                    amount += MICROSOFT_FEE
                 elif student.is_postgrad and student.state == PAID:
                     # Returning postgraduate students also pay for the