Merge pull request #214 from Adyen/develop

Hotfix release 2.1.3

.github/ISSUE_TEMPLATE.md

+**Magento version**: x.y.z
+**Plugin version**: x.y.z
+**Description**
+<!--
+- please provide description of the issue. In case of bug report, please provide the necessary steps to reproduce.
+- For merchant specific requests, please use https://support.adyen.com
+-->
\ No newline at end of file

.github/PULL_REQUEST_TEMPLATE.md

+**Description**
+<!-- Please provide a description of the changes proposed in the Pull Request -->
+
+**Tested scenarios**
+<!-- Description of tested scenarios -->
+
+**Fixed issue**:  <!-- #-prefixed issue number -->
\ No newline at end of file

Block/Redirect/Redirect.php

@@ -84,7 +84,8 @@ class Redirect extends \Magento\Payment\Block\Form
         \Adyen\Payment\Logger\AdyenLogger $adyenLogger,
         \Magento\Tax\Model\Config $taxConfig,
         \Magento\Tax\Model\Calculation $taxCalculation
-    ) {
+    )
+    {
         $this->_orderFactory = $orderFactory;
         $this->_checkoutSession = $checkoutSession;
         parent::__construct($context, $data);
@@ -131,7 +132,8 @@ class Redirect extends \Magento\Payment\Block\Form
                             } else {
                                 if ($this->_adyenHelper->isPaymentMethodOpenInvoiceMethod(
                                     $this->_order->getPayment()->getAdditionalInformation('brand_code')
-                                )) {
+                                )
+                                ) {
                                     $url = "https://test.adyen.com/hpp/skipDetails.shtml";
                                 } else {
                                     $url = "https://test.adyen.com/hpp/details.shtml";
@@ -148,7 +150,8 @@ class Redirect extends \Magento\Payment\Block\Form
                             } else {
                                 if ($this->_adyenHelper->isPaymentMethodOpenInvoiceMethod(
                                     $this->_order->getPayment()->getAdditionalInformation('brand_code')
-                                )) {
+                                )
+                                ) {
                                     $url = "https://live.adyen.com/hpp/skipDetails.shtml";
                                 } else {
                                     $url = "https://live.adyen.com/hpp/details.shtml";
@@ -158,7 +161,7 @@ class Redirect extends \Magento\Payment\Block\Form
                         break;
                 }
             }
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             // do nothing for now
             throw($e);
         }
@@ -203,7 +206,8 @@ class Redirect extends \Magento\Payment\Block\Form
                 // if directory lookup is enabled use the billingaddress as countrycode
                 if ($countryCode == false) {
                     if ($this->_order->getBillingAddress() &&
-                        $this->_order->getBillingAddress()->getCountryId() != "") {
+                        $this->_order->getBillingAddress()->getCountryId() != ""
+                    ) {
                         $countryCode = $this->_order->getBillingAddress()->getCountryId();
                     }
                 }
@@ -274,8 +278,6 @@ class Redirect extends \Magento\Payment\Block\Form
                 $formFields = $this->setOpenInvoiceData($formFields);
 
                 $formFields['shopper.gender'] = $this->getGenderText($this->_order->getCustomerGender());
-
-
                 $dob = $this->_order->getCustomerDob();
                 if ($dob) {
                     $formFields['shopper.dateOfBirthDayOfMonth'] = trim($this->_getDate($dob, 'd'));
@@ -285,6 +287,10 @@ class Redirect extends \Magento\Payment\Block\Form
 
                 // For klarna acceptPrivacyPolicy to skip HPP page
                 if ($brandCode == "klarna") {
+                    $ssn = $this->_order->getPayment()->getAdditionalInformation('ssn');
+                    if (!empty($ssn)) {
+                        $formFields['shopper.socialSecurityNumber'] = $ssn;
+                    }
                     //  // needed for DE and AT
                     $formFields['klarna.acceptPrivacyPolicy'] = 'true';
                 }
@@ -318,13 +324,9 @@ class Redirect extends \Magento\Payment\Block\Form
                 $this->_adyenLogger->addAdyenDebug(print_r($formFields, true));
             }
 
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             // do nothing for now
         }
-
-//        echo "GENDER" . $this->_order->getCustomerGender();
-//
-//        print_r($formFields);die();
         return $formFields;
     }
 
@@ -336,9 +338,7 @@ class Redirect extends \Magento\Payment\Block\Form
     protected function setBillingAddressData($formFields)
     {
         $billingAddress = $this->_order->getBillingAddress();
-
         if ($billingAddress) {
-
             $formFields['shopper.firstName'] = trim($billingAddress->getFirstname());
             $middleName = trim($billingAddress->getMiddlename());
             if ($middleName != "") {
@@ -347,7 +347,6 @@ class Redirect extends \Magento\Payment\Block\Form
 
             $formFields['shopper.lastName'] = trim($billingAddress->getLastname());
             $formFields['shopper.telephoneNumber'] = trim($billingAddress->getTelephone());
-
             $street = $this->_adyenHelper->getStreet($billingAddress);
 
             if (isset($street['name']) && $street['name'] != "") {
@@ -467,7 +466,7 @@ class Redirect extends \Magento\Payment\Block\Form
             // Calculate vat percentage
             $itemVatPercentage = $this->_adyenHelper->getMinorUnitTaxPercent($item->getTaxPercent());
 
-            $numberOfItems = (int) $item->getQtyOrdered();
+            $numberOfItems = (int)$item->getQtyOrdered();
 
             $formFields = $this->setOpenInvoiceLineData($formFields, $count, $currency, $description, $itemAmount,
                 $itemVatAmount, $itemVatPercentage, $numberOfItems);
@@ -515,7 +514,7 @@ class Redirect extends \Magento\Payment\Block\Form
                 $itemVatAmount, $itemVatPercentage, $numberOfItems);
         }
 
-        $formFields['openinvoicedata.refundDescription'] = "Refund / Correction for ".$formFields['merchantReference'];
+        $formFields['openinvoicedata.refundDescription'] = "Refund / Correction for " . $formFields['merchantReference'];
         $formFields['openinvoicedata.numberOfLines'] = $count;
 
         return $formFields;
@@ -535,8 +534,9 @@ class Redirect extends \Magento\Payment\Block\Form
      */
     protected function setOpenInvoiceLineData($formFields, $count, $currencyCode, $description, $itemAmount,
                                               $itemVatAmount, $itemVatPercentage, $numberOfItems
-    ) {
-        $linename = "line".$count;
+    )
+    {
+        $linename = "line" . $count;
         $formFields['openinvoicedata.' . $linename . '.currencyCode'] = $currencyCode;
         $formFields['openinvoicedata.' . $linename . '.description'] = $description;
         $formFields['openinvoicedata.' . $linename . '.itemAmount'] = $itemAmount;
@@ -545,7 +545,8 @@ class Redirect extends \Magento\Payment\Block\Form
         $formFields['openinvoicedata.' . $linename . '.numberOfItems'] = $numberOfItems;
 
         if ($this->_adyenHelper->isVatCategoryHigh($this->_order->getPayment()->getAdditionalInformation(
-            \Adyen\Payment\Observer\AdyenHppDataAssignObserver::BRAND_CODE))) {
+            \Adyen\Payment\Observer\AdyenHppDataAssignObserver::BRAND_CODE))
+        ) {
             $formFields['openinvoicedata.' . $linename . '.vatCategory'] = "High";
         } else {
             $formFields['openinvoicedata.' . $linename . '.vatCategory'] = "None";

Gateway/Command/PayByMailCommand.php

@@ -26,6 +26,7 @@ namespace Adyen\Payment\Gateway\Command;
 use Magento\Payment\Gateway\Command;
 use Magento\Payment\Gateway\CommandInterface;
 
+
 class PayByMailCommand implements CommandInterface
 {
 
@@ -34,11 +35,6 @@ class PayByMailCommand implements CommandInterface
      */
     protected $_adyenHelper;
 
-    /**
-     * @var ResolverInterface
-     */
-    protected $_resolver;
-
     /**
      * @var \Adyen\Payment\Logger\AdyenLogger
      */
@@ -53,11 +49,9 @@ class PayByMailCommand implements CommandInterface
      */
     public function __construct(
         \Adyen\Payment\Helper\Data $adyenHelper,
-        \Magento\Framework\Locale\ResolverInterface $resolver,
         \Adyen\Payment\Logger\AdyenLogger $adyenLogger
     ) {
         $this->_adyenHelper = $adyenHelper;
-        $this->_resolver = $resolver;
         $this->_adyenLogger = $adyenLogger;
     }
     /**
@@ -134,6 +128,7 @@ class PayByMailCommand implements CommandInterface
 
         $realOrderId       = $order->getRealOrderId();
         $orderCurrencyCode = $order->getOrderCurrencyCode();
+        $storeId = $order->getStore()->getId();
 
         // check if paybymail has it's own skin
         $skinCode          = trim($this->_adyenHelper->getAdyenPayByMailConfigData('skin_code'));
@@ -141,18 +136,20 @@ class PayByMailCommand implements CommandInterface
             // use HPP skin and HMAC
             $skinCode = $this->_adyenHelper->getAdyenHppConfigData('skin_code');
             $hmacKey           = $this->_adyenHelper->getHmac();
+            $shopperLocale     = trim($this->_adyenHelper->getAdyenHppConfigData('shopper_locale', $storeId));
+            $countryCode       = trim($this->_adyenHelper->getAdyenHppConfigData('country_code', $storeId));
         } else {
             // use pay_by_mail skin and hmac
             $hmacKey = $this->_adyenHelper->getHmacPayByMail();
         }
 
         $amount            = $this->_adyenHelper->formatAmount($order->getGrandTotal(), $orderCurrencyCode);
-        $merchantAccount   = trim($this->_adyenHelper->getAdyenAbstractConfigData('merchant_account'));
+        $merchantAccount   = trim($this->_adyenHelper->getAdyenAbstractConfigData('merchant_account', $storeId));
         $shopperEmail      = $order->getCustomerEmail();
         $customerId        = $order->getCustomerId();
-        $shopperLocale     = trim($this->_adyenHelper->getAdyenHppConfigData('shopper_locale'));
-        $shopperLocale     = (!empty($shopperLocale)) ? $shopperLocale : $this->_resolver->getLocale();
-        $countryCode       = trim($this->_adyenHelper->getAdyenHppConfigData('country_code'));
+
+        // get locale from store
+        $shopperLocale     = (!empty($shopperLocale)) ? $shopperLocale : $this->_adyenHelper->getStoreLocale($storeId);
         $countryCode       = (!empty($countryCode)) ? $countryCode : false;
 
         // if directory lookup is enabled use the billingadress as countrycode
@@ -164,7 +161,7 @@ class PayByMailCommand implements CommandInterface
             }
         }
 
-        $deliveryDays                   = $this->_adyenHelper->getAdyenHppConfigData('delivery_days');
+        $deliveryDays                   = $this->_adyenHelper->getAdyenHppConfigData('delivery_days', $storeId);
         $deliveryDays                   = (!empty($deliveryDays)) ? $deliveryDays : 5;
 
         $formFields = [];
@@ -184,9 +181,9 @@ class PayByMailCommand implements CommandInterface
 
         $formFields['shopperEmail']      = $shopperEmail;
         // recurring
-        $recurringType                   = trim($this->_adyenHelper->getAdyenAbstractConfigData('recurring_type'));
+        $recurringType                   = trim($this->_adyenHelper->getAdyenAbstractConfigData('recurring_type', $storeId));
         
-        $sessionValidity = $this->_adyenHelper->getAdyenPayByMailConfigData('session_validity');
+        $sessionValidity = $this->_adyenHelper->getAdyenPayByMailConfigData('session_validity', $storeId);
 
         if ($sessionValidity == "") {
             $sessionValidity = 3;

Helper/Data.php

@@ -816,4 +816,9 @@ class Data extends AbstractHelper
         return $this->_assetRepo->createAsset($fileId, $params);
     }
 
+    public function getStoreLocale($storeId) {
+        $path = \Magento\Directory\Helper\Data::XML_PATH_DEFAULT_LOCALE;
+        return $this->scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId);
+    }
+
 }
\ No newline at end of file

Helper/PaymentMethods.php

@@ -336,9 +336,9 @@ class PaymentMethods extends AbstractHelper
             return $locale;
         }
 
-        // should have the vulue if not fall back to default
+        // should have the value if not fall back to default
         $localeCode = $this->_config->getValue(
-            Data::XML_PATH_DEFAULT_LOCALE,
+            \Magento\Directory\Helper\Data::XML_PATH_DEFAULT_LOCALE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
             $store->getCode()
         );

Model/Notification.php

@@ -48,6 +48,7 @@ class Notification extends \Magento\Framework\Model\AbstractModel
     const RECURRING_CONTRACT = "RECURRING_CONTRACT";
     const REPORT_AVAILABLE = "REPORT_AVAILABLE";
     const ORDER_CLOSED = "ORDER_CLOSED";
+    const OFFER_CLOSED = "OFFER_CLOSED";
 
     /**
      * Notification constructor.
@@ -85,11 +86,12 @@ class Notification extends \Magento\Framework\Model\AbstractModel
      * @param $eventCode
      * @param $success
      * @param $originalReference
-     * @return bool (true if the notification is a duplicate)
+     * @param null $done
+     * @return bool
      */
-    public function isDuplicate($pspReference, $eventCode, $success, $originalReference)
+    public function isDuplicate($pspReference, $eventCode, $success, $originalReference, $done = null)
     {
-        $result = $this->getResource()->getNotification($pspReference, $eventCode, $success, $originalReference);
+        $result = $this->getResource()->getNotification($pspReference, $eventCode, $success, $originalReference, $done);
         return (empty($result)) ? false : true;
     }
     

Model/Resource/Notification.php

@@ -41,16 +41,25 @@ class Notification extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param $eventCode
      * @param $success
      * @param $originalReference
+     * @param null $done
      * @return array
      */
-    public function getNotification($pspReference, $eventCode, $success, $originalReference)
+    public function getNotification($pspReference, $eventCode, $success, $originalReference, $done = null)
     {
         $select = $this->getConnection()->select()
             ->from(['notification' => $this->getTable('adyen_notification')])
             ->where('notification.pspreference=?', $pspReference)
             ->where('notification.event_code=?', $eventCode)
-            ->where('notification.success=?', $success)
-            ->where('notification.original_reference=?', $originalReference);
+            ->where('notification.success=?', $success);
+
+        if ($done !== null) {
+            $select->where('notification.done=?', $done);
+        }
+
+        if ($originalReference) {
+            $select->where('notification.original_reference=?', $originalReference);
+        }
+        
         return $this->getConnection()->fetchAll($select);
     }
 }
\ No newline at end of file

Model/Ui/AdyenHppConfigProvider.php

@@ -81,7 +81,8 @@ class AdyenHppConfigProvider implements ConfigProviderInterface
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Checkout\Model\Session $session
-    ) {
+    )
+    {
         $this->_paymentHelper = $paymentHelper;
         $this->_adyenHelper = $adyenHelper;
         $this->_request = $request;
@@ -141,8 +142,8 @@ class AdyenHppConfigProvider implements ConfigProviderInterface
             'show_telephone'
         );
         $config['payment'] ['adyenHpp']['ratePayId'] = $this->_adyenHelper->getRatePayId();
-        $config['payment'] ['adyenHpp']['deviceIdentToken'] = md5($this->_session->getQuoteId().date('c'));
-
+        $config['payment'] ['adyenHpp']['deviceIdentToken'] = md5($this->_session->getQuoteId() . date('c'));
+        $config['payment'] ['adyenHpp']['nordicCountries'] = ['SE', 'NO', 'DK', 'FI'];
 
         return $config;
     }

Observer/AdyenBoletoDataAssignObserver.php

@@ -61,6 +61,8 @@ class AdyenBoletoDataAssignObserver extends AbstractDataAssignObserver
 
         $paymentInfo = $this->readPaymentModelArgument($observer);
         
+        $paymentInfo->setCcType('boleto');
+
         foreach ($this->additionalInformationList as $additionalInformationKey) {
             if (isset($additionalData[$additionalInformationKey])) {
                 $paymentInfo->setAdditionalInformation(

Observer/AdyenHppDataAssignObserver.php

@@ -37,6 +37,7 @@ class AdyenHppDataAssignObserver extends AbstractDataAssignObserver
     const DOB = 'dob';
     const TELEPHONE = 'telephone';
     const DF_VALUE = 'df_value';
+    const SSN = 'ssn';
 
 
     /**
@@ -48,7 +49,8 @@ class AdyenHppDataAssignObserver extends AbstractDataAssignObserver
         self::GENDER,
         self::DOB,
         self::TELEPHONE,
-        self::DF_VALUE
+        self::DF_VALUE,
+        self::SSN
     ];
 
     /**
@@ -66,6 +68,10 @@ class AdyenHppDataAssignObserver extends AbstractDataAssignObserver
 
         $paymentInfo = $this->readPaymentModelArgument($observer);
         
+        if (isset($additionalData[self::BRAND_CODE])) {
+            $paymentInfo->setCcType($additionalData[self::BRAND_CODE]);
+        }
+
         foreach ($this->additionalInformationList as $additionalInformationKey) {
             if (isset($additionalData[$additionalInformationKey])) {
                 $paymentInfo->setAdditionalInformation(
@@ -75,4 +81,4 @@ class AdyenHppDataAssignObserver extends AbstractDataAssignObserver
                 }
             }
         }
-}
+    }

Observer/AdyenSepaDataAssignObserver.php

@@ -61,6 +61,8 @@ class AdyenSepaDataAssignObserver extends AbstractDataAssignObserver
 
         $paymentInfo = $this->readPaymentModelArgument($observer);
         
+        $paymentInfo->setCcType('sepa');
+
         foreach ($this->additionalInformationList as $additionalInformationKey) {
             if (isset($additionalData[$additionalInformationKey])) {
                 $paymentInfo->setAdditionalInformation(

README.md

 # Adyen_Magento2
-Adyen Payment plugin for Magento2
-
+Adyen Payment plugin for Magento2. This plugin supports Magento2 version 2.1 and higher. <br/>
+For Magento2 version 2.0 support, use plugin version 1.4.6.
 ## Installation ##
 ```
 bin/composer require adyen/module-payment

composer.json

@@ -2,13 +2,12 @@
   "name": "adyen/module-payment",
   "description": "Official Magento2 Plugin to connect to Payment Service Provider Adyen.",
   "type": "magento2-module",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "license": [
     "OSL-3.0",
     "AFL-3.0"
   ],
   "require": {
-    "php": "~5.5.0|~5.6.0|~7.0.0",
     "adyen/php-api-library": "*"
   },
   "autoload": {

etc/config.xml

@@ -192,12 +192,5 @@
                 <group>adyen</group>
             </adyen_boleto>
         </payment>
-        <dev>
-            <js>
-                <minify_exclude>
-                    live.adyen.com/hpp/js/df
-                </minify_exclude>
-            </js>
-        </dev>
     </default>
 </config>

etc/module.xml

@@ -24,7 +24,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
 
-    <module name="Adyen_Payment" setup_version="2.1.2">
+    <module name="Adyen_Payment" setup_version="2.1.3">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Quote"/>