Changeset 11554

Timestamp:

30 Mar 2014, 05:52:51 (10 years ago)

Author:

Henrik Bettermann

Message:

Webservice returns error message if payment ticket is paid (ticket #88).

Location:

main/waeup.aaue/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/aaue/etranzact/browser.py (modified) (2 diffs)
• src/waeup/aaue/etranzact/tests.py (modified) (1 diff)

main/waeup.aaue/trunk/CHANGES.txt

@@ -4 +4 @@
 1.2dev (unreleased)
 ===================
+
+* Webservice returns error message if payment ticket is paid.
 
 * Adapt exporters and batch processors to customized interfaces.

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

@@ -105 +105 @@
             self.output = ERROR_PART1 + 'Invalid PAYEE_ID' + ERROR_PART2
             return
+        amount = results[0].amount_auth
+        payment_type = results[0].category
+        programme_type = results[0].p_item
+        academic_session = academic_sessions_vocab.getTerm(
+            results[0].p_session).title
+        status = results[0].p_state
+        if status == 'paid':
+            self.output = ERROR_PART1 + 'PAYEE_ID already used' + ERROR_PART2
+            return
         if PAYMENT_TYPE == 'SCHOOL-FEE' \
             and not results[0].p_category.startswith('schoolfee'):
@@ -130 +139 @@
             self.output = ERROR_PART1 +  'Unknown error' + ERROR_PART2
             return
-        amount = results[0].amount_auth
-        payment_type = results[0].category
-        programme_type = results[0].p_item
-
-        academic_session = academic_sessions_vocab.getTerm(
-            results[0].p_session).title
-        status = results[0].p_state
         self.output = (
             # Version 1

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

@@ -131 +131 @@
             % self.p_id)
         self.assertEqual(self.browser.contents, ERROR_PART1 + 'Wrong PAYMENT_TYPE' + ERROR_PART2)
+        self.student['payments'][self.p_id].p_state = 'paid'
+        self.browser.open(
+            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=SCHOOL-FEE'
+            % self.p_id)
+        self.assertEqual(self.browser.contents, ERROR_PART1 + 'PAYEE_ID already used' + ERROR_PART2)