Merge pull request #139 from Adyen/develop

Release 5.1.0

Author: AlexandrosMor

Adyen/client.py

@@ -173,6 +173,10 @@ def _determine_checkout_url(self, platform, action):
             action = "payments/result"
         if action == "originKeys":
             api_version = settings.API_CHECKOUT_UTILITY_VERSION
+        if action == "paymentMethodsBalance":
+            action = "paymentMethods/balance"
+        if action == "ordersCancel":
+            action = "orders/cancel"
 
         return '/'.join([base_uri, api_version, action])
 
@@ -492,7 +496,8 @@ def call_checkout_api(self, request_data, action, idempotency_key=None,
             "authorise3ds2",
             "payments",
             "paymentSession",
-            "paymentLinks"
+            "paymentLinks",
+            "paymentMethodsBalance"
         ]
 
         if action in with_app_info:

Adyen/services.py

@@ -128,6 +128,7 @@ class AdyenPayment(AdyenServiceBase):
     API calls currently implemented:
         authorise
         authorise3d
+        adjustAuthorisation
         cancel
         capture
         refund
@@ -170,6 +171,12 @@ def authorise3d(self, request, idempotency_key=None, **kwargs):
         return self.client.call_api(request, self.service,
                                     action, idempotency_key, **kwargs)
 
+    def adjustAuthorisation(self, request, **kwargs):
+        action = "adjustAuthorisation"
+
+        return self.client.call_api(request, self.service,
+                                    action, **kwargs)
+
     def cancel(self, request, idempotency_key=None, **kwargs):
         action = "cancel"
 
@@ -272,6 +279,7 @@ class AdyenCheckoutApi(AdyenServiceBase):
         payments
         payments/details
         originKeys
+
     Please refer to the checkout documentation for specifics around the API.
     https://docs.adyen.com/developers/checkout
 
@@ -318,6 +326,23 @@ def origin_keys(self, request=None, **kwargs):
         action = "originKeys"
         return self.client.call_checkout_api(request, action, **kwargs)
 
+    # Orders endpoints
+
+    # /paymentMethods/balance
+    def payment_methods_balance(self, request, **kwargs):
+        action = "paymentMethodsBalance"
+        return self.client.call_checkout_api(request, action, **kwargs)
+
+    # /orders
+    def orders(self, request, **kwargs):
+        action = "orders"
+        return self.client.call_checkout_api(request, action, **kwargs)
+
+    # /orders/cancel
+    def orders_cancel(self, request, **kwargs):
+        action = "ordersCancel"
+        return self.client.call_checkout_api(request, action, **kwargs)
+
 
 class AdyenBinLookup(AdyenServiceBase):
     """This represents the Adyen API Bin Lookup service.

Adyen/settings.py

@@ -12,5 +12,5 @@
 API_RECURRING_VERSION = "v49"
 API_PAYMENT_VERSION = "v64"
 API_PAYOUT_VERSION = "v64"
-LIB_VERSION = "5.0.0"
+LIB_VERSION = "5.1.0"
 LIB_NAME = "adyen-python-api-library"

setup.py

@@ -3,7 +3,7 @@
 setup(
     name='Adyen',
     packages=['Adyen'],
-    version='5.0.0',
+    version='5.1.0',
     maintainer='Adyen',
     maintainer_email='[email protected]',
     description='Adyen Python Api',

test/CheckoutTest.py

@@ -97,7 +97,7 @@ def test_payments_error_mocked(self):
                 'returnUrl': 'https://your-company.com/...',
                 u'applicationInfo': {
                     u'adyenLibrary': {
-                        u'version': '5.0.0',
+                        u'version': '5.1.0',
                         u'name': 'adyen-python-api-library'
                     }
                 },
@@ -235,3 +235,42 @@ def test_payments_result_error_mocked(self):
         self.assertEqual("14_018", result.message['errorCode'])
         self.assertEqual("Invalid payload provided", result.message['message'])
         self.assertEqual("validation", result.message['errorType'])
+
+    def test_orders_success(self):
+        request = {'merchantAccount': "YourMerchantAccount"}
+        self.adyen.client = self.test.create_client_from_file(200, request,
+                                                              "test/mocks/"
+                                                              "checkout/"
+                                                              "orders"
+                                                              "-success.json")
+        result = self.adyen.checkout.orders(request)
+        self.assertEqual("8515930288670953", result.message['pspReference'])
+        self.assertEqual("Success", result.message['resultCode'])
+        self.assertEqual("order reference", result.message['reference'])
+        self.assertEqual("EUR", result.message['remainingAmount']["currency"])
+        self.assertEqual(2500, result.message['remainingAmount']['value'])
+
+    def test_orders_cancel_success(self):
+        request = {'merchantAccount': "YourMerchantAccount"}
+        self.adyen.client = self.test.create_client_from_file(200, request,
+                                                              "test/mocks/"
+                                                              "checkout/"
+                                                              "orders-cancel"
+                                                              "-success.json")
+        result = self.adyen.checkout.orders_cancel(request)
+        self.assertEqual("8515931182066678", result.message['pspReference'])
+        self.assertEqual("Received", result.message['resultCode'])
+
+    def test_paymentmethods_balance_success(self):
+        request = {'merchantAccount': "YourMerchantAccount"}
+        self.adyen.client = self.test.create_client_from_file(200, request,
+                                                              "test/mocks/"
+                                                              "checkout/"
+                                                              "paymentmethods"
+                                                              "-balance"
+                                                              "-success.json")
+        result = self.adyen.checkout.payment_methods_balance(request)
+        self.assertEqual("851611111111713K", result.message['pspReference'])
+        self.assertEqual("Success", result.message['resultCode'])
+        self.assertEqual(100, result.message['balance']['value'])
+        self.assertEqual("EUR", result.message['balance']['currency'])

test/DetermineEndpointTest.py

@@ -106,3 +106,25 @@ def test_binlookup_url_no_live_endpoint_prefix_test_platform(self):
             ("https://pal-test.adyen.com/pal/servlet/"
              "BinLookup/v50/get3dsAvailability")
         )
+
+    def test_checkout_api_url_orders(self):
+        self.client.live_endpoint_prefix = None
+        url = self.adyen.client._determine_checkout_url("test",
+                                                        "orders")
+        self.assertEqual(url, "https://checkout-test.adyen.com"
+                              "/v67/orders")
+
+    def test_checkout_api_url_order_cancel(self):
+        self.client.live_endpoint_prefix = None
+        url = self.adyen.client._determine_checkout_url("test",
+                                                        "ordersCancel")
+        self.assertEqual(url, "https://checkout-test.adyen.com"
+                              "/v67/orders/cancel")
+
+    def test_checkout_api_url_order_payment_methods_balance(self):
+        self.client.live_endpoint_prefix = None
+        url = self.adyen.client._determine_checkout_url("test",
+                                                        "paymentMethods"
+                                                        "Balance")
+        self.assertEqual(url, "https://checkout-test.adyen.com""/v67/"
+                              "paymentMethods/balance")

test/ModificationTest.py

@@ -83,6 +83,21 @@ def test_cancel_received(self):
         result = self.ady.payment.cancel(request)
         self.assertEqual("[cancel-received]", result.message['response'])
 
+    def test_adjust_authorisation_received(self):
+        request = {}
+        request['merchantAccount'] = "YourMerchantAccount"
+        request['reference'] = "YourReference"
+        request['modificationAmount'] = {"value": "1234", "currency": "EUR"}
+        request['originalReference'] = "YourOriginalReference"
+        self.ady.client = self.test.create_client_from_file(200, request,
+                                                            'test/mocks/'
+                                                            'adjust-'
+                                                            'authorisation-'
+                                                            'received.json')
+        result = self.ady.payment.adjustAuthorisation(request)
+        self.assertEqual("[adjustAuthorisation-received]",
+                         result.message['response'])
+
 
 TestModifications.client.http_force = "requests"
 suite = unittest.TestLoader().loadTestsFromTestCase(TestModifications)

test/mocks/adjust-authorisation-received.json

@@ -0,0 +1,4 @@
+{
+  "pspReference": "PSP_REFERENCE",
+  "response": "[adjustAuthorisation-received]"
+}

test/mocks/checkout/orders-cancel-success.json

@@ -0,0 +1,4 @@
+{
+  "pspReference": "8515931182066678",
+  "resultCode": "Received"
+}

test/mocks/checkout/orders-success.json

@@ -0,0 +1,11 @@
+{
+  "pspReference": "8515930288670953",
+  "resultCode": "Success",
+  "expiresAt": "2020-06-25T20:01:07Z",
+  "orderData": "Ab02b4c0!BQABAgBqxSuFhuXUF7IvIRvSw5bDPHN...",
+  "reference": "order reference",
+  "remainingAmount": {
+    "currency": "EUR",
+    "value": 2500
+  }
+}