Changeset 13799

Timestamp:

5 Apr 2016, 05:48:39 (9 years ago)

Author:

Henrik Bettermann

Message:

Catch pg balance payments.

Location:

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

Files:

• browser.py (modified) (1 diff)
• tests.py (modified) (3 diffs)

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

@@ -158 +158 @@
             self.output = ERROR_PART1 + 'Not a postgrad student' + ERROR_PART2
             return
-        if student and '-PG' not in PAYMENT_TYPE and student.is_postgrad:
+        if student and '-PG' not in PAYMENT_TYPE and student.is_postgrad \
+            and results[0].p_item != 'Balance':
             self.output = ERROR_PART1 + 'Postgrad student' + ERROR_PART2
             return

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

@@ -144 +144 @@
         self.assertEqual(self.browser.contents, ERROR_PART1 + 'Wrong PAYMENT_TYPE' + ERROR_PART2)
 
+        # Change payment state
         self.student['payments'][self.p_id].p_state = 'paid'
+
         self.browser.open(
             'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=SCHOOL-FEE-NEW'
@@ -150 +152 @@
         self.assertEqual(self.browser.contents, ERROR_PART1 + 'PAYEE_ID already used' + ERROR_PART2)
 
+        # Change workflow state and payment state
         IWorkflowState(self.student).setState('returning')
         self.student['payments'][self.p_id].p_state = 'unpaid'
+
         self.browser.open(
             'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=SCHOOL-FEE-NEW'
@@ -161 +165 @@
             % self.p_id)
         self.assertEqual(self.browser.contents, ERROR_PART1 + 'Not a balance payment' + ERROR_PART2)
+
+        # 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'
             % self.p_id)
         self.assertEqual(self.browser.contents, ERROR_PART1 + 'Balance payment' + ERROR_PART2)
+
+        # Change study mode
+        self.certificate.study_mode = 'special_pg_ft'
+
+        self.browser.open(
+            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=SCHOOL-FEE-BALANCE'
+            % self.p_id)
+        self.assertEqual(self.browser.contents,
+            'PayeeName=Anna Tester~'
+            'Faculty=fac1~'
+            'Department=dep1~'
+            'Level=100~'
+            'ProgrammeType=Balance~'
+            'StudyType=special_pg_ft~'
+            'Session=2004/2005~'
+            'PayeeID=%s~'
+            'Amount=1234.0~'
+            'FeeStatus=unpaid~'
+            'Semester=N/A~'
+            'PaymentType=School Fee Plus~'
+            'MatricNumber=E1000000~'
+            'Email=aa@aa.ng~'
+            'PhoneNumber=1234' % self.p_id)
+
+        # Change payment item
         self.payment.p_item = u'CERT1'
 
+        self.browser.open(
+            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=SCHOOL-FEE-PLUS-RETURNING'
+            % self.p_id)
+        self.assertEqual(self.browser.contents, ERROR_PART1 + 'Postgrad student' + ERROR_PART2)
+
+        # Cange payment category and study mode
         self.payment.p_category = 'schoolfee'
-        self.certificate.study_mode = 'special_pg_ft'
-        self.browser.open(
-            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=SCHOOL-FEE-RETURNING'
-            % self.p_id)
-        self.assertEqual(self.browser.contents, ERROR_PART1 + 'Postgrad student' + ERROR_PART2)
-
         self.certificate.study_mode = 'ug_ft'
+        
         self.browser.open(
             'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=SCHOOL-FEE-RETURNING'