Changeset 14087 for main/waeup.aaue/trunk/src/waeup/aaue/etranzact/browser.py

Timestamp:

18 Aug 2016, 06:01:42 (8 years ago)

Author:

Henrik Bettermann

Message:

Add payment types for foundation programme fees.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/etranzact/browser.py (modified) (2 diffs)

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

@@ -106 +106 @@
             'SCHOOL-FEE-PT-BALANCE': ('schoolfee','schoolfee_incl',
                                       'schoolfee_1','schoolfee_2'),
+            'SCHOOL-FEE-FP-NEW': ('schoolfee',),
 
             'ACCEPTANCE-FEE': ('clearance',),
             'ACCEPTANCE-FEE-PLUS': ('clearance_incl',),
             'ACCEPTANCE-FEE-PG': ('clearance',),
-
             'ACCEPTANCE-FEE-PT': ('clearance',),
             'ACCEPTANCE-FEE-PT-PLUS': ('clearance_incl',),
             'ACCEPTANCE-FEE-PT-PG': ('clearance',),
+            'ACCEPTANCE-FEE-FP': ('clearance',),
 
             'APPLICATION-FEE': ('application',),
             'APPLICATION-FEE-PT': ('application',),
+            'APPLICATION-FEE-FP': ('application',),
 
             'LATE-REGISTRATION': ('late_registration',),
@@ -200 +202 @@
             and student.current_mode.endswith('_pt'):
             self.output = ERROR_PART1 + 'Part-time student' + ERROR_PART2
+            return
+        if student and '-FP' in PAYMENT_TYPE and student.current_mode != 'found':
+            self.output = ERROR_PART1 + 'Not a foundation programme student' + ERROR_PART2
+            return
+        if student and '-FP' not in PAYMENT_TYPE and student.current_mode == 'found':
+            self.output = ERROR_PART1 + 'Foundation programme student' + ERROR_PART2
             return
         if '-BALANCE' in PAYMENT_TYPE and results[0].p_item != 'Balance':