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

Timestamp:

23 Apr 2018, 07:36:08 (7 years ago)

Author:

Henrik Bettermann

Message:

IJMBE students do not have to pay Student Union Dues + Welfare Assurance Fee.

Location:

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

Files:

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

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

@@ -272 +272 @@
                 xmldict['institution_amt'] = 100 * (
                     gateway_net_amt(self.context.amount_auth))
-            elif self.context.p_category in ('schoolfee_incl', 'schoolfee_1'):
+            elif self.context.p_category in ('schoolfee_incl', 'schoolfee_1') \
+                and student.current_mode != 'ijmbe':
                 # Schoolfee including additional fees
                 xmldict['student_union_due_amt'] = 100 * student_union_due_amt

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

@@ -295 +295 @@
         'clearance': 'Acceptance Fee',
         'schoolfee': 'School Fee',
-        'schoolfee_1': 'School Fee (1st instalment) + Student Union Dues + Welfare Assurance Fee',
+        'schoolfee_1': 'School Fee (1st instalment)',
         'schoolfee_2': 'School Fee (2nd instalment)',
         }

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

@@ -418 +418 @@
                 return _(u'Amount could not be determined.'), None
             # Add Student Union Fee , Student Id Card Fee and Welfare Assurance
-            if category in ('schoolfee_incl', 'schoolfee_1'):
+            if category in ('schoolfee_incl', 'schoolfee_1') and \
+                student.current_mode != 'ijmbe':
                 amount += gateway_net_amt(academic_session.welfare_fee) + \
                     gateway_net_amt(academic_session.union_fee)