Changeset 8754

Timestamp:

18 Jun 2012, 17:02:17 (12 years ago)

Author:

Henrik Bettermann

Message:

Disable QUERY_STRING processing until eTranzact has replied to Uli's mail.

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

@@ -43 +43 @@
 
     def update(self, PAYEE_ID=None):
-        # It seems eTranzact sends a POST request with an empty body but the URL
-        # contains a query string. So it's actually a GET request pretended
-        # to be a POST request. Although this does not comply with the
-        # RFC 2616 HTTP guidelines we try to fetch the id from the QUERY_STRING
-        # value of the request.
         real_ip = self.request.get('HTTP_X_FORWARDED_FOR', None)
         if real_ip  and ACCEPTED_IP:
@@ -53 +48 @@
                 self.output = '-4'
                 return
-        if PAYEE_ID is None:
-            try:
-                PAYEE_ID = self.request['QUERY_STRING'].split('=')[1]
-            except:
-                self.output = '-2'
-                return
+
+        # It seems eTranzact sends a POST request with an empty body but the URL
+        # contains a query string. So it's actually a GET request pretended
+        # to be a POST request. Although this does not comply with the
+        # RFC 2616 HTTP guidelines we may try to fetch the id from the QUERY_STRING
+        # value of the request.
+
+        #if PAYEE_ID is None:
+        #    try:
+        #        PAYEE_ID = self.request['QUERY_STRING'].split('=')[1]
+        #    except:
+        #        self.output = '-2'
+        #        return
+
         cat = getUtility(ICatalog, name='payments_catalog')
         results = list(cat.searchResults(p_id=(PAYEE_ID, PAYEE_ID)))

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

@@ -50 +50 @@
         # Managers can add online payment tickets
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.app['configuration']['2004'].school_fee_base = 1234.0
         self.browser.open(self.payments_path)
         IWorkflowState(self.student).setState('cleared')
@@ -56 +57 @@
         self.assertMatches('...ticket created...',
                            self.browser.contents)
+
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[0]
@@ -78 +80 @@
             'RETURN_TYPE=%s&'
             'PROGRAMME_TYPE=CERT1&'
-            'PAYMENT_TYPE=School Fee&'
+            'PAYMENT_TYPE=School Fee 1st instalment&'
             'ACADEMIC_SESSION=2004/2005&'
             'MATRIC_NO=E1000000&'
-            'FEE_AMOUNT=40000.0&'
+            'FEE_AMOUNT=1234.0&'
             'TRANSACTION_STATUS=unpaid' % self.p_id)