Changeset 8263 for main/waeup.uniben/trunk/src/waeup/uniben/students

Timestamp:

24 Apr 2012, 15:37:51 (13 years ago)

Author:

Henrik Bettermann

Message:

Remove surcharge configuration completely.

Implement application fee and school fee payments via Interswitch (part 3)

Location:

main/waeup.uniben/trunk/src/waeup/uniben/students

Files:

• browser.py (modified) (1 diff)
• utils.py (modified) (4 diffs)

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

@@ -181 +181 @@
 
     def _fillCustomFields(self, payment, pay_details):
-        payment.surcharge_1 = pay_details['surcharge_1']
-        payment.surcharge_2 = pay_details['surcharge_2']
-        payment.surcharge_3 = pay_details['surcharge_3']
+        # No custom fields at the moment
         return payment
 

main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py

@@ -23 +23 @@
 from waeup.uniben.interfaces import MessageFactory as _
 
-def get_school_fee(student, surcharge):
+def get_school_fee(student):
     study_mode = student['studycourse'].certificate.study_mode
     entry_mode = student['studycourse'].entry_mode
@@ -34 +34 @@
         # fresh
         if state == CLEARED:
-            return 40000.0 - surcharge
+            return 40000.0
         # returning
         elif state == RETURNING:
-            return 20000.0 - surcharge
+            return 20000.0
         else:
             return 0.0
@@ -88 +88 @@
     def getPaymentDetails(self, category, student):
         d = {}
-        d['surcharge_1'] = d['surcharge_2'] = d['surcharge_3'] = 0.0
         d['p_item'] = u''
         d['amount'] = 0.0
@@ -111 +110 @@
             d['amount'] = academic_session.clearance_fee
         elif category == 'schoolfee':
-            d['surcharge_1'] = academic_session.surcharge_1
-            d['surcharge_2'] = academic_session.surcharge_2
-            d['amount'] = get_school_fee(student, d['surcharge_1'] + d['surcharge_2'])
+            d['amount'] = get_school_fee(student)
             code = student['studycourse'].certificate.code
             d['p_item'] = code