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

Timestamp:

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

Author:

Henrik Bettermann

Message:

Add payment types for foundation programme fees.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• tests.py (modified) (3 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':

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

@@ -168 +168 @@
         # Change payment item
         self.payment.p_item = u'Balance'
-
         self.browser.open(
             'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=SCHOOL-FEE-PLUS-RETURNING'
@@ -176 +175 @@
         # Change study mode
         self.certificate.study_mode = 'special_pg_pt'
-
         self.browser.open(
             'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=SCHOOL-FEE-BALANCE'
@@ -232 +230 @@
             'Email=aa@aa.ng~'
             'PhoneNumber=1234' % self.p_id)
+
+        IWorkflowState(self.student).setState('cleared')
+        self.browser.open(
+            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=SCHOOL-FEE-FP-NEW'
+            % self.p_id)
+        self.assertEqual(self.browser.contents, ERROR_PART1 + 'Not a foundation programme student' + ERROR_PART2)
+        self.certificate.study_mode = 'found'
+        self.browser.open(
+            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=SCHOOL-FEE-NEW'
+            % self.p_id)
+        self.assertEqual(self.browser.contents, ERROR_PART1 + 'Foundation programme student' + ERROR_PART2)
 
     @external_test