Changeset 11650

Timestamp:

14 May 2014, 06:46:12 (11 years ago)

Author:

Henrik Bettermann

Message:

• The PAYMENT_TYPE Etranzact is sending contains the amount and is being compared with amount_auth of the payment ticket.

Location:

main/waeup.aaue/trunk

Files:

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

main/waeup.aaue/trunk/CHANGES.txt

@@ -4 +4 @@
 1.2dev (unreleased)
 ===================
+
+* The PAYMENT_TYPE Etranzact is sending contains the amount and is
+  being compared with amount_auth of the payment ticket.
 
 * To guarantee that cleared students pay both acceptance fee and school fees,

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

@@ -65 +65 @@
     These are not the data of the payee but of the payer. And it's
     not the id of the payer but of the payment.
+
+    The PAYMENT_TYPE Etranzact is sending contains the amount and is
+    being compared with amount_auth of the payment ticket.
     """
     grok.name('feerequest')
@@ -84 +87 @@
                 self.output = ERROR_PART1 + 'Wrong IP address' + ERROR_PART2
                 return
-        if PAYMENT_TYPE not in ('SCHOOL-FEE', 'ACCEPTANCE-FEE', 'APPLICATION-FEE'):
+
+        #if PAYMENT_TYPE not in ('SCHOOL-FEE', 'ACCEPTANCE-FEE', 'APPLICATION-FEE'):
+
+        try:
+            payment_type_amount = int(PAYMENT_TYPE)
+        except (ValueError, TypeError):
             self.output = ERROR_PART1 + 'Invalid PAYMENT_TYPE' + ERROR_PART2
             return
@@ -114 +122 @@
             self.output = ERROR_PART1 + 'PAYEE_ID already used' + ERROR_PART2
             return
-        if PAYMENT_TYPE == 'SCHOOL-FEE' \
-            and not results[0].p_category.startswith('schoolfee'):
+
+        #if PAYMENT_TYPE == 'SCHOOL-FEE' \
+        #    and not results[0].p_category.startswith('schoolfee'):
+        #    self.output = ERROR_PART1 + 'Wrong PAYMENT_TYPE' + ERROR_PART2
+        #    return
+        #if PAYMENT_TYPE == 'ACCEPTANCE-FEE' \
+        #    and not results[0].p_category == 'clearance':
+        #    self.output = ERROR_PART1 + 'Wrong PAYMENT_TYPE' + ERROR_PART2
+        #    return
+        #if PAYMENT_TYPE == 'APPLICATION-FEE' \
+        #    and not results[0].p_category == 'application':
+        #    self.output = ERROR_PART1 + 'Wrong PAYMENT_TYPE' + ERROR_PART2
+        #    return
+        
+        if payment_type_amount != amount:
             self.output = ERROR_PART1 + 'Wrong PAYMENT_TYPE' + ERROR_PART2
             return
-        if PAYMENT_TYPE == 'ACCEPTANCE-FEE' \
-            and not results[0].p_category == 'clearance':
-            self.output = ERROR_PART1 + 'Wrong PAYMENT_TYPE' + ERROR_PART2
-            return
-        if PAYMENT_TYPE == 'APPLICATION-FEE' \
-            and not results[0].p_category == 'application':
-            self.output = ERROR_PART1 + 'Wrong PAYMENT_TYPE' + ERROR_PART2
-            return
+
         try:
             owner = IPayer(results[0])

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

@@ -84 +84 @@
     def test_webservice(self):
         self.browser.open(
-            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=SCHOOL-FEE'
+            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=1234'
             % self.p_id)
         self.assertEqual(self.browser.contents,
-            # Version 1
-            #'FULL_NAME=Anna Tester&'
-            #'FACULTY=fac1&'
-            #'DEPARTMENT=dep1&'
-            #'RETURN_TYPE=%s&'
-            #'PROGRAMME_TYPE=CERT1&'
-            #'PAYMENT_TYPE=School Fee&'
-            #'ACADEMIC_SESSION=2004/2005&'
-            #'MATRIC_NO=E1000000&'
-            #'FEE_AMOUNT=1234.0&'
-            #'TRANSACTION_STATUS=unpaid'
-
-            # Version 2
             'PayeeName=Anna Tester~'
             'Faculty=fac1~'
@@ -121 +108 @@
         self.assertEqual(self.browser.contents, ERROR_PART1 + 'Missing PAYEE_ID' + ERROR_PART2)
         self.browser.open(
-            'http://localhost/app/feerequest?PAYEE_ID=nonsense&PAYMENT_TYPE=SCHOOL-FEE')
+            'http://localhost/app/feerequest?PAYEE_ID=nonsense&PAYMENT_TYPE=1234')
         self.assertEqual(self.browser.contents, ERROR_PART1 + 'Invalid PAYEE_ID' + ERROR_PART2)
         self.browser.open(
@@ -132 +119 @@
         self.assertEqual(self.browser.contents, ERROR_PART1 + 'Invalid PAYMENT_TYPE' + ERROR_PART2)
         self.browser.open(
-            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=ACCEPTANCE-FEE'
-            % self.p_id)
-        self.assertEqual(self.browser.contents, ERROR_PART1 + 'Wrong PAYMENT_TYPE' + ERROR_PART2)
-        self.browser.open(
-            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=APPLICATION-FEE'
+            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=3456'
             % 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'
+            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=1234'
             % self.p_id)
         self.assertEqual(self.browser.contents, ERROR_PART1 + 'PAYEE_ID already used' + ERROR_PART2)