Changeset 14083

Timestamp:

17 Aug 2016, 04:09:07 (8 years ago)

Author:

Henrik Bettermann

Message:

Extend category_mapping. Distinguish part-time and full-time students.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• tests.py (modified) (2 diffs)

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

@@ -96 +96 @@
             'SCHOOL-FEE-BALANCE': ('schoolfee','schoolfee_incl',
                                    'schoolfee_1','schoolfee_2'),
+            'SCHOOL-FEE-PT-NEW': ('schoolfee',),
+            'SCHOOL-FEE-PT-RETURNING': ('schoolfee',),
+            'SCHOOL-FEE-PT-PLUS-NEW': ('schoolfee_incl',),
+            'SCHOOL-FEE-PT-PLUS-RETURNING': ('schoolfee_incl',),
+            'SCHOOL-FEE-PT-PG-NEW': ('schoolfee',),
+            'SCHOOL-FEE-PT-PG-RETURNING': ('schoolfee',),
+            'SCHOOL-FEE-PT-FIRST-INSTALMENT-PLUS': ('schoolfee_1',),
+            'SCHOOL-FEE-PT-SECOND-INSTALMENT': ('schoolfee_2',),
+            'SCHOOL-FEE-PT-BALANCE': ('schoolfee','schoolfee_incl',
+                                      'schoolfee_1','schoolfee_2'),
+
             'ACCEPTANCE-FEE': ('clearance',),
             'ACCEPTANCE-FEE-PLUS': ('clearance_incl',),
@@ -161 +172 @@
             and results[0].p_item != 'Balance':
             self.output = ERROR_PART1 + 'Postgrad student' + ERROR_PART2
+            return
+        if student and '-PT' in PAYMENT_TYPE \
+            and not student.current_mode.endswith('_pt'):
+            self.output = ERROR_PART1 + 'Not a part-time student' + ERROR_PART2
+            return
+        if student and '-PT' not in PAYMENT_TYPE \
+            and student.current_mode.endswith('_pt'):
+            self.output = ERROR_PART1 + 'Part-time 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

@@ -175 +175 @@
 
         # Change study mode
-        self.certificate.study_mode = 'special_pg_ft'
+        self.certificate.study_mode = 'special_pg_pt'
 
         self.browser.open(
             'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=SCHOOL-FEE-BALANCE'
+            % self.p_id)
+        self.assertEqual(self.browser.contents, ERROR_PART1 + 'Part-time student' + ERROR_PART2)
+        self.browser.open(
+            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=SCHOOL-FEE-PT-BALANCE'
             % self.p_id)
         self.assertEqual(self.browser.contents,
@@ -186 +190 @@
             'Level=100~'
             'ProgrammeType=Balance~'
-            'StudyType=special_pg_ft~'
+            'StudyType=special_pg_pt~'
             'Session=2004/2005~'
             'PayeeID=%s~'