Merge pull request #446 from Adyen/PW-1281

PW-1256 Fix new Klarna integration for checkout api

Controller/Process/Result.php

@@ -173,36 +173,35 @@ class Result extends \Magento\Framework\App\Action\Action
 			$response = $this->validatePayloadAndReturnResponse($response);
 		}
 
-        $incrementId = $response['merchantReference'];
-
-        if ($incrementId) {
-            $order = $this->_getOrder($incrementId);
-            if ($order->getId()) {
-                $this->_eventManager->dispatch('adyen_payment_process_resulturl_before', [
-                    'order' => $order,
-                    'adyen_response' => $response
-                ]);
-                if (isset($response['handled'])) {
-                    return $response['handled_response'];
-                }
+        $incrementId = null;
 
-                // update the order
-                $result = $this->_validateUpdateOrder($order, $response);
+        if (!empty($response['merchantReference'])) {
+            $incrementId = $response['merchantReference'];
+        }
 
-                $this->_eventManager->dispatch('adyen_payment_process_resulturl_after', [
-                    'order' => $order,
-                    'adyen_response' => $response
-                ]);
-            } else {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Order does not exists with increment_id: %1', $incrementId)
-                );
+        $order = $this->_getOrder($incrementId);
+        if ($order->getId()) {
+            $this->_eventManager->dispatch('adyen_payment_process_resulturl_before', [
+                'order' => $order,
+                'adyen_response' => $response
+            ]);
+            if (isset($response['handled'])) {
+                return $response['handled_response'];
             }
+
+            // update the order
+            $result = $this->_validateUpdateOrder($order, $response);
+
+            $this->_eventManager->dispatch('adyen_payment_process_resulturl_after', [
+                'order' => $order,
+                'adyen_response' => $response
+            ]);
         } else {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('Empty merchantReference')
+                __('Order does not exists with increment_id: %1', $incrementId)
             );
         }
+
         return $result;
     }
 
@@ -351,11 +350,16 @@ class Result extends \Magento\Framework\App\Action\Action
      * @param $incrementId
      * @return \Magento\Sales\Model\Order
      */
-    protected function _getOrder($incrementId)
+    protected function _getOrder($incrementId = null)
     {
         if (!$this->_order) {
-            $this->_order = $this->_orderFactory->create()->loadByIncrementId($incrementId);
+            if (!is_null($incrementId)) {
+                $this->_order = $this->_orderFactory->create()->loadByIncrementId($incrementId);
+            } else {
+                $this->_order = $this->_session->getLastRealOrder();
+            }
         }
+
         return $this->_order;
     }
 
@@ -371,11 +375,13 @@ class Result extends \Magento\Framework\App\Action\Action
 		$client = $this->_adyenHelper->initializeAdyenClient($this->storeManager->getStore()->getId());
 		$service = $this->_adyenHelper->createAdyenCheckoutService($client);
 
-		$request = array(
-			"details" => array(
-				"payload" => $response["payload"]
-			)
-		);
+        $request = [];
+
+		if (!empty($this->_session->getLastRealOrder()->getPayment()->getAdditionalInformation("paymentData"))) {
+            $request['paymentData'] = $this->_session->getLastRealOrder()->getPayment()->getAdditionalInformation("paymentData");
+        }
+
+		$request["details"] = $response;
 
 		try {
 			$response = $service->paymentsDetails($request);
@@ -385,4 +391,4 @@ class Result extends \Magento\Framework\App\Action\Action
 
 		return $response;
 	}
-}
+}
\ No newline at end of file

Gateway/Request/CheckoutDataBuilder.php

@@ -228,6 +228,7 @@ class CheckoutDataBuilder implements BuilderInterface
             $formattedPriceExcludingTax = $this->adyenHelper->formatAmount($priceExcludingTax, $currency);
 
             $formattedTaxAmount = $this->adyenHelper->formatAmount($item->getTaxAmount(), $currency);
+            $formattedTaxPercentage = $item->getTaxPercent() * 100;
 
             $formFields['lineItems'][] = [
                 'id' => $item->getId(),
@@ -237,7 +238,7 @@ class CheckoutDataBuilder implements BuilderInterface
                 'description' => $item->getName(),
                 'quantity' => $item->getQty(),
                 'taxCategory' => $item->getProduct()->getAttributeText('tax_class_id'),
-                'taxPercentage' => $item->getTaxPercent()
+                'taxPercentage' => $formattedTaxPercentage
             ];
         }
 
@@ -272,13 +273,19 @@ class CheckoutDataBuilder implements BuilderInterface
 
             $taxClassId = $this->taxConfig->getShippingTaxClass($this->storeManager->getStore()->getId());
 
+            $formattedTaxPercentage = 0;
+
+            if ($priceExcludingTax !== 0) {
+                $formattedTaxPercentage = $this->quote->getShippingAddress()->getShippingTaxAmount() / $priceExcludingTax * 100 * 100;
+            }
+            
             $formFields['lineItems'][] = [
                 'itemId' => 'shippingCost',
                 'amountExcludingTax' => $formattedPriceExcludingTax,
                 'taxAmount' => $formattedTaxAmount,
                 'description' => $order->getShippingDescription(),
                 'quantity' => 1,
-                'taxPercentage' => $this->quote->getShippingAddress()->getShippingTaxAmount()
+                'taxPercentage' => $formattedTaxPercentage
             ];
         }
 

Gateway/Request/CustomerDataBuilder.php

@@ -111,6 +111,11 @@ class CustomerDataBuilder implements BuilderInterface
 			if ($countryId = $billingAddress->getCountryId()) {
 				$result['countryCode'] = $countryId;
 			}
+
+			if ($shopperLocale = $this->adyenHelper->getCurrentLocaleCode($order->getStoreId())) {
+                $result['shopperLocale'] = $shopperLocale;
+            }
+
 		}
 
         return $result;

Helper/Data.php

@@ -118,6 +118,16 @@ class Data extends AbstractHelper
      */
     private $agreementResourceModel;
 
+    /**
+     * @var \Magento\Framework\Locale\ResolverInterface
+     */
+    private $localeResolver;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $config;
+
     /**
      * Data constructor.
      * @param \Magento\Framework\App\Helper\Context $context
@@ -155,7 +165,9 @@ class Data extends AbstractHelper
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\CacheInterface $cache,
         \Adyen\Payment\Model\Billing\AgreementFactory $billingAgreementFactory,
-        \Adyen\Payment\Model\ResourceModel\Billing\Agreement $agreementResourceModel
+        \Adyen\Payment\Model\ResourceModel\Billing\Agreement $agreementResourceModel,
+        \Magento\Framework\Locale\ResolverInterface $localeResolver,
+        \Magento\Framework\App\Config\ScopeConfigInterface $config
     ) {
         parent::__construct($context);
         $this->_encryptor = $encryptor;
@@ -174,6 +186,8 @@ class Data extends AbstractHelper
         $this->cache = $cache;
         $this->billingAgreementFactory = $billingAgreementFactory;
         $this->agreementResourceModel = $agreementResourceModel;
+        $this->localeResolver = $localeResolver;
+        $this->config = $config;
     }
 
     /**
@@ -1701,4 +1715,30 @@ class Data extends AbstractHelper
 		$timeStamp = new \DateTime($date);
 		return $timeStamp->format($format);
 	}
+
+    /**
+     * @param int $storeId
+     * @return mixed|string
+     */
+    public function getCurrentLocaleCode($storeId)
+    {
+        $localeCode = $this->getAdyenAbstractConfigData('shopper_locale', $storeId);
+        if ($localeCode != "") {
+            return $localeCode;
+        }
+
+        $locale = $this->localeResolver->getLocale();
+        if ($locale) {
+            return $locale;
+        }
+
+        // should have the value if not fall back to default
+        $localeCode = $this->config->getValue(
+            \Magento\Directory\Helper\Data::XML_PATH_DEFAULT_LOCALE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
+            $store->getCode()
+        );
+
+        return $localeCode;
+    }
 }

Helper/PaymentMethods.php

@@ -198,7 +198,7 @@ class PaymentMethods extends AbstractHelper
                 ),
             ],
             "shopperReference" => $this->getCurrentShopperReference(),
-            "shopperLocale" => $this->getCurrentLocaleCode($store)
+            "shopperLocale" => $this->adyenHelper->getCurrentLocaleCode($store->getId())
         ];
 
         $billingAddress = $this->getQuote()->getBillingAddress();
@@ -325,32 +325,6 @@ class PaymentMethods extends AbstractHelper
         return "";
     }
 
-    /**
-     * @param $store
-     * @return mixed|string
-     */
-    protected function getCurrentLocaleCode($store)
-    {
-        $localeCode = $this->adyenHelper->getAdyenAbstractConfigData('shopper_locale', $store->getId());
-        if ($localeCode != "") {
-            return $localeCode;
-        }
-
-        $locale = $this->localeResolver->getLocale();
-        if ($locale) {
-            return $locale;
-        }
-
-        // should have the value if not fall back to default
-        $localeCode = $this->config->getValue(
-            \Magento\Directory\Helper\Data::XML_PATH_DEFAULT_LOCALE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
-            $store->getCode()
-        );
-
-        return $localeCode;
-    }
-
     /**
      * @var array
      */

view/frontend/web/js/view/payment/method-renderer/adyen-hpp-method.js

@@ -412,6 +412,11 @@ define(
                      */
                     result.renderKlarnaComponent = function () {
 
+                        /* The new Klarna integration doesn't return details and the component does not handle it */
+                        if (!value.details) {
+                            return;
+                        }
+
                         var klarnaNode = document.getElementById('klarnaContainer');
 
                         var klarna = self.checkoutComponent.create('klarna', {