Changeset 39 for trunk

Timestamp:

04/09/08 01:15:42 (4 years ago)

Author:

tim

Message:

Settle is implemented

Location:

trunk/fpys

Files:

• client.py (modified) (2 diffs)
• tests/client_test.py (modified) (1 diff)
• tests/wsgi_responder.py (modified) (1 diff)

trunk/fpys/client.py

@@ -100 +100 @@
         # Hackish at best... 
         root_tag = document.getroot().tag
-        if root_tag.find("PayResponse") >= 0 or root_tag.find("ReserveResponse") >= 0:
-            self.transaction = TransactionResponse()
-            self.transaction.id = document.find("//TransactionId").text
-            self.transaction.status = document.find("//Status").text
-            
+        for tag_name in ["PayResponse", "ReserveResponse", "SettleResponse"]:
+            if self.success and root_tag.find(tag_name) >= 0:
+                self.transaction = TransactionResponse()
+                self.transaction.id = document.find("//TransactionId").text
+                self.transaction.status = document.find("//Status").text
+
 
 class FlexiblePaymentClient(object):
@@ -370 +371 @@
         pass
 
-    def settle(self):
-        pass
-
+    def settle(self,
+               transaction_id,
+               amount,
+               date = None):
+        params = {'Action': 'Settle',
+                  'ReserveTransactionId': transaction_id,
+                  'TransactionAmount.Amount': amount,
+                  'TransactionAmount.CurrencyCode': 'USD'}
+        if date is not None:
+            params['TransactionDate'] = date
+
+        return self.execute(params)
+
+                  
+

trunk/fpys/tests/client_test.py

@@ -172 +172 @@
     assert response.transaction.id == "134OLF7MHB2L4V9T54RHADQ9FCK5NLVZHDC"
 
+def test_settle_over_amount():
+    response = fps_client.settle("134OLF7MHB2L4V9T54RHADQ9FCK5NLVZHDC",
+                                 "100.00")
+    assert response.success == False
+    assert 1 == len(response.errors)
+    assert response.errors[0]['errorCode'] == 'SettleAmountGreaterThanReserveAmount'
+
+def test_settle():
+    response = fps_client.settle("134OLF7MHB2L4V9T54RHADQ9FCK5NLVZHDC",
+                                 "19.95")
+    assert response.success == True
+    assert response.transaction.id == "134OLF7MHB2L4V9T54RHADQ9FCK5NLVZHDC"
+    assert response.transaction.status == "Initiated"
+
     

trunk/fpys/tests/wsgi_responder.py

@@ -75 +75 @@
         return [response]
 
+    def Settle(self, environ):
+        if environ['fps.params']['TransactionAmount.Amount'][0] == "100.00":
+            response = """<ns0:SettleResponse xmlns:ns0="http://fps.amazonaws.com/doc/2007-01-08/"><Status>Failure</Status><Errors><Errors><ErrorType>Business</ErrorType><IsRetriable>false</IsRetriable><ErrorCode>SettleAmountGreaterThanReserveAmount</ErrorCode><ReasonText>Settle Amount "$100.000000" is greater than the Reserve Amount "$19.950000"</ReasonText></Errors></Errors><RequestId>d6449438-af36-441d-9b79-88b3a363f3e0:0</RequestId></ns0:SettleResponse>"""
+        else:
+            response = """<ns0:SettleResponse xmlns:ns0="http://fps.amazonaws.com/doc/2007-01-08/"><ns0:TransactionResponse><TransactionId>134OLF7MHB2L4V9T54RHADQ9FCK5NLVZHDC</TransactionId><Status>Initiated</Status></ns0:TransactionResponse><Status>Success</Status><RequestId>a412e705-389e-4579-ad78-eee5bb611467:0</RequestId></ns0:SettleResponse>"""
+        return[response]
+       
 flexible_payment_service = FlexiblePaymentService()