fix Adyen dependency

djadyen/constants.py

@@ -0,0 +1,2 @@
+LIVE_URL_PREFIX_ERROR = "Please provide the live_url_prefix. "
+"https://docs.adyen.com/development-resources/live-endpoints#live-url-prefix"

djadyen/management/commands/sync_payment_methods.py

@@ -4,6 +4,7 @@
 
 from djadyen import settings
 
+from ...constants import LIVE_URL_PREFIX_ERROR
 from ...models import AdyenIssuer, AdyenPaymentOption
 
 
@@ -41,8 +42,11 @@ def handle(self, *args, **options):
         if not settings.DJADYEN_ENVIRONMENT:
             assert False, "Please provide an environment."
 
-        if settings.DJADYEN_ENVIRONMENT == "live" and not settings.DJADYEN_LIVE_URL_PREFIX:
-            assert False, "Please provide the live_url_prefix. https://docs.adyen.com/development-resources/live-endpoints#live-url-prefix"
+        if (
+            settings.DJADYEN_ENVIRONMENT == "live"
+            and not settings.DJADYEN_LIVE_URL_PREFIX
+        ):
+            assert False, LIVE_URL_PREFIX_ERROR
 
         # Setting global values
         ady.payment.client.platform = settings.DJADYEN_ENVIRONMENT
@@ -55,7 +59,7 @@ def handle(self, *args, **options):
             "merchantAccount": settings.DJADYEN_MERCHANT_ACCOUNT,
         }
         # Starting the checkout.
-        result = ady.checkout.payment_methods(request)
+        result = ady.checkout.payments_api.payment_methods(request)
 
         payment_methods = result.message.get("paymentMethods")
         for payment_method in payment_methods:

djadyen/templatetags/adyen_tags.py

@@ -1,11 +1,13 @@
 import logging
+
 from django import template
 from django.utils.translation import get_language
 
 import Adyen
 
 from djadyen import settings
 from djadyen.choices import Status
+from djadyen.constants import LIVE_URL_PREFIX_ERROR
 
 register = template.Library()
 logger = logging.getLogger("adyen")
@@ -28,7 +30,7 @@ def adyen_payment_component(
         assert False, "Please provide an environment."
 
     if settings.DJADYEN_ENVIRONMENT == "live" and not settings.DJADYEN_LIVE_URL_PREFIX:
-        assert False, "Please provide the live_url_prefix. https://docs.adyen.com/development-resources/live-endpoints#live-url-prefix"
+        assert False, LIVE_URL_PREFIX_ERROR
 
     # Setting global values
     ady.payment.client.platform = settings.DJADYEN_ENVIRONMENT
@@ -46,9 +48,11 @@ def adyen_payment_component(
         "merchantAccount": merchant_account,
         "returnUrl": order.get_return_url(),
         "shopperLocale": language.lower(),
-        "countryCode": country_code.lower()
-        if country_code
-        else settings.DJADYEN_DEFAULT_COUNTRY_CODE,
+        "countryCode": (
+            country_code.lower()
+            if country_code
+            else settings.DJADYEN_DEFAULT_COUNTRY_CODE
+        ),
     }
     try:
         request["shopperEmail"] = order.email
@@ -57,7 +61,7 @@ def adyen_payment_component(
 
     logger.info(request)
     # Starting the checkout.
-    result = ady.checkout.sessions(request)
+    result = ady.checkout.payments_api.sessions(request)
 
     if result.status_code == 201:
         return {
@@ -67,9 +71,9 @@ def adyen_payment_component(
             "environment": settings.DJADYEN_ENVIRONMENT,
             "redirect_url": order.get_return_url,
             "language": get_language(),
-            "payment_type": order.payment_option.adyen_name
-            if order.payment_option
-            else "",
+            "payment_type": (
+                order.payment_option.adyen_name if order.payment_option else ""
+            ),
             "issuer": order.issuer.adyen_id if order.issuer else "",
         }
     return {}

djadyen/views.py

@@ -1,12 +1,13 @@
 import logging
 
-from django.http import JsonResponse, HttpResponseRedirect
+from django.http import HttpResponseRedirect, JsonResponse
 from django.views.generic.detail import DetailView
 
 import Adyen
 
 from djadyen import settings
 from djadyen.choices import Status
+from djadyen.constants import LIVE_URL_PREFIX_ERROR
 
 logger = logging.getLogger("adyen")
 
@@ -45,8 +46,11 @@ def get(self, request, *args, **kwargs):
             if not settings.DJADYEN_ENVIRONMENT:
                 assert False, "Please provide an environment."
 
-            if settings.DJADYEN_ENVIRONMENT == "live" and not settings.DJADYEN_LIVE_URL_PREFIX:
-                assert False, "Please provide the live_url_prefix. https://docs.adyen.com/development-resources/live-endpoints#live-url-prefix"
+            if (
+                settings.DJADYEN_ENVIRONMENT == "live"
+                and not settings.DJADYEN_LIVE_URL_PREFIX
+            ):
+                assert False, LIVE_URL_PREFIX_ERROR
 
             # Setting global values
             ady.payment.client.platform = settings.DJADYEN_ENVIRONMENT
@@ -61,7 +65,7 @@ def get(self, request, *args, **kwargs):
                 },
             }
             # Requesting the status.
-            result = ady.checkout.payments_details(request)
+            result = ady.checkout.payments_api.payments_details(request)
             result_code = result.message.get("resultCode")
             if result_code == "Authorised":
                 self.handle_authorised(self.object)

setup.cfg

@@ -31,7 +31,7 @@ zip_safe = False
 include_package_data = True
 packages = find:
 install_requires =
-    Adyen>=6.0.0<7.0.0
+    Adyen>=10.0.0
     django>=1.10
     django-choices
     requests

testapp/settings.py

@@ -69,9 +69,12 @@
 ]
 
 # New settings
+DJADYEN_ENVIRONMENT = "test"
 DJADYEN_SERVER_KEY = "test_server_key"
 DJADYEN_CLIENT_KEY = "test_client_key"
 DJADYEN_APPNAME = "Djadyen testapp"
 DJADYEN_MERCHANT_ACCOUNT = "Djadyen_merchant_account"
 DJADYEN_ORDER_MODELS = ["testapp.Order"]
-DJADYEN_NOTIFICATION_KEY = "3424242342353453422435626342654643645624564526436435643542364365"
+DJADYEN_NOTIFICATION_KEY = (
+    "3424242342353453422435626342654643645624564526436435643542364365"
+)

testapp/urls.py

@@ -1,5 +1,5 @@
 try:
-    from django.urls import path, include
+    from django.urls import include, path
 except Exception:
     from django.conf.urls import url as path, include
 

testapp/views.py

@@ -1,5 +1,3 @@
-from django.views.generic import TemplateView
-
 from djadyen.choices import Status
 from djadyen.views import AdyenResponseView
 

tests/factories.py

@@ -2,7 +2,6 @@
 
 from djadyen.choices import Status
 from djadyen.models import AdyenIssuer, AdyenNotification, AdyenPaymentOption
-
 from testapp.models import Order
 
 

tests/test_management_command.py

@@ -20,7 +20,7 @@ class SyncPaymentMethods(TestFileMixin, TestCase):
     @requests_mock.mock()
     def test_on_empty_database_mock(self, mock):
         mock.post(
-            "https://checkout-test.adyen.com/v69/paymentMethods",
+            "https://checkout-test.adyen.com/v71/paymentMethods",
             [
                 {
                     "content": self._get_test_file("payment_methods.json").read(),
@@ -37,7 +37,7 @@ def test_on_empty_database_mock(self, mock):
     @requests_mock.mock()
     def test_on_existing_database_mock(self, mock):
         mock.post(
-            "https://checkout-test.adyen.com/v69/paymentMethods",
+            "https://checkout-test.adyen.com/v71/paymentMethods",
             [
                 {
                     "content": self._get_test_file("payment_methods.json").read(),

tests/test_notification_views.py

@@ -1,4 +1,5 @@
 import json
+
 from django.urls import reverse
 
 from django_webtest import WebTest