added country_code

djadyen/models.py

@@ -10,7 +10,7 @@
 
 from .choices import Status
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("adyen")
 
 
 class AdyenNotification(models.Model):

djadyen/notifications/views.py

@@ -10,7 +10,7 @@
 from ..models import AdyenNotification
 from .hmac import get_signature
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("adyen")
 
 
 class NotificationView(View):

djadyen/settings.py

@@ -12,3 +12,6 @@
 )
 DJADYEN_ORDER_MODELS = getattr(dj_settings, "DJADYEN_ORDER_MODELS")
 DJADYEN_NOTIFICATION_KEY = getattr(dj_settings, "DJADYEN_NOTIFICATION_KEY")
+DJADYEN_DEFAULT_COUNTRY_CODE = getattr(
+    dj_settings, "DJADYEN_DEFAULT_COUNTRY_CODE", "nl"
+)

djadyen/templates/adyen/component.html

@@ -13,6 +13,3 @@
     {% if issuer %}data-issuer="{{ issuer }}"{% endif %}
 ></div>
 <div id="djadyen-container"></div>
-<div id="djadyen-actions">
-    <button id="button" class="button button">{% trans "Betaal" %}</button>
-</div>

djadyen/templates/adyen/pay.html

@@ -3,5 +3,5 @@
 
 
 {% block content %}
-{% adyen_payment_component order=object %}
+{% adyen_payment_component language=request.LANGUAGE_CODE order=object %}
 {% endblock %}

djadyen/templatetags/adyen_tags.py

@@ -1,3 +1,4 @@
+import logging
 from django import template
 from django.utils.translation import get_language
 
@@ -7,31 +8,41 @@
 from djadyen.choices import Status
 
 register = template.Library()
+logger = logging.getLogger("adyen")
 
 
 @register.inclusion_tag("adyen/component.html")
-def adyen_payment_component(order):
+def adyen_payment_component(
+    language,
+    order,
+    merchant_account=settings.DJADYEN_MERCHANT_ACCOUNT,
+    country_code=settings.DJADYEN_DEFAULT_COUNTRY_CODE,
+):
     """
     Will display a singular payment method.
     """
+    logger.info("Start new payment for {}".format(str(order.reference)))
     ady = Adyen.Adyen()
 
     # Setting global values
     ady.payment.client.platform = settings.DJADYEN_ENVIRONMENT
     ady.payment.client.xapikey = settings.DJADYEN_SERVER_KEY
     ady.payment.client.app_name = settings.DJADYEN_APPNAME
-
     # Setting request data.
     request = {
         "amount": {
             "value": order.get_price_in_cents(),
             "currency": settings.DJADYEN_CURRENCYCODE,
         },
         "reference": str(order.reference),
-        "merchantAccount": settings.DJADYEN_MERCHANT_ACCOUNT,
+        "merchantAccount": merchant_account,
         "returnUrl": order.get_return_url(),
+        "shopperLocale": language.lower(),
+        "countryCode": country_code.lower()
+        if country_code
+        else settings.DJADYEN_DEFAULT_COUNTRY_CODE,
     }
-
+    logger.info(request)
     # Starting the checkout.
     result = ady.checkout.sessions(request)
 

djadyen/views.py

@@ -1,6 +1,6 @@
 import logging
 
-from django.http import JsonResponse
+from django.http import JsonResponse, HttpResponseRedirect
 from django.views.generic.detail import DetailView
 
 from .choices import Status
@@ -18,11 +18,26 @@ class AdyenPaymentView(DetailView):
     slug_field = "reference"
     slug_url_kwarg = "reference"
 
+    def get(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        if self.object.get_price_in_cents() == 0:
+            return HttpResponseRedirect(self.object.get_return_url())
+        return super(AdyenPaymentView, self).get(request, *args, **kwargs)
+
 
 class AdyenResponseView(DetailView):
     slug_field = "reference"
     slug_url_kwarg = "reference"
 
+    def get(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        if self.object.get_price_in_cents() == 0:
+            self.handle_authorised(self.object)
+        return super(AdyenResponseView, self).get(request, *args, **kwargs)
+
+    def handle_authorised(self, order):
+        raise NotImplementedError()
+
 
 class AdyenOrderStatusView(DetailView):
     slug_field = "reference"

javascript/djadyen.js

@@ -5,13 +5,13 @@ import "./overwrites.css";
 
 document.addEventListener("DOMContentLoaded", async () => {
     const config = document.querySelector("#djadyen-config");
-    const button = document.querySelector("#button");
 
     if (config) {
         const configuration = {
             environment: config.dataset.environment,
             clientKey: config.dataset.clientKey,
             locale: config.dataset.language,
+            showPayButton: true,
             analytics: {
                 enabled: false,
             },
@@ -50,11 +50,6 @@ document.addEventListener("DOMContentLoaded", async () => {
                 component.submit();
             }, 50);
         }
-
-        button.addEventListener("click", (event) => {
-            event.preventDefault();
-            component.submit();
-        });
     }
 });
 

setup.cfg

@@ -2,7 +2,7 @@
 # see http://setuptools.readthedocs.io/en/latest/setuptools.html#configuring-setup-using-setup-cfg-files
 [metadata]
 name = djadyen
-version = 2.0.4a5
+version = 2.0.4a19
 description = Django adyen payment integration
 long_description = file: README.rst
 url = https://github.com/maykinmedia/djadyen