#36 fixes needed for new 2.0.6 release of magento

Model/Method/Cc.php

@@ -167,20 +167,29 @@ class Cc extends \Magento\Payment\Model\Method\Cc
     public function assignData(\Magento\Framework\DataObject $data)
     {
         parent::assignData($data);
-        $infoInstance = $this->getInfoInstance();
 
-        $infoInstance->setCcType($data['cc_type']);
+        if (!$data instanceof \Magento\Framework\DataObject) {
+            $data = new \Magento\Framework\DataObject($data);
+        }
+
+        $additionalData = $data->getAdditionalData();
+        $infoInstance = $this->getInfoInstance();
 
+        if(isset($additionalData['cc_type'])) {
+            $infoInstance->setCcType($additionalData['cc_type']);
+        }
         if($this->_adyenHelper->getAdyenCcConfigDataFlag('cse_enabled')) {
-            if(isset($data['encrypted_data'])) {
-                $infoInstance->setAdditionalInformation('encrypted_data', $data['encrypted_data']);
+            if(isset($additionalData['encrypted_data'])) {
+                $infoInstance->setAdditionalInformation('encrypted_data', $additionalData['encrypted_data']);
             } else {
                 throw new \Magento\Framework\Exception\LocalizedException(__('Card encryption failed'));
             }
         }
 
         // save value remember details checkbox
-        $infoInstance->setAdditionalInformation('store_cc', $data['store_cc']);
+        if(isset($additionalData['store_cc'])) {
+            $infoInstance->setAdditionalInformation('store_cc', $additionalData['store_cc']);
+        }
 
         return $this;
     }
@@ -191,7 +200,7 @@ class Cc extends \Magento\Payment\Model\Method\Cc
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)authorize
      */
     public function validate()
     {

Model/Method/Hpp.php

@@ -186,14 +186,20 @@ class Hpp extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa
     public function assignData(\Magento\Framework\DataObject $data)
     {
         parent::assignData($data);
+
+        if (!$data instanceof \Magento\Framework\DataObject) {
+            $data = new \Magento\Framework\DataObject($data);
+        }
+
+        $additionalData = $data->getAdditionalData();
         $infoInstance = $this->getInfoInstance();
 
-        if(isset($data['brand_code'])) {
-            $infoInstance->setAdditionalInformation('brand_code', $data['brand_code']);
+        if(isset($additionalData['brand_code'])) {
+            $infoInstance->setAdditionalInformation('brand_code', $additionalData['brand_code']);
         }
 
-        if(isset($data['issuer_id'])) {
-            $infoInstance->setAdditionalInformation('issuer_id', $data['issuer_id']);
+        if(isset($additionalData['issuer_id'])) {
+            $infoInstance->setAdditionalInformation('issuer_id', $additionalData['issuer_id']);
         }
 
         $this->_adyenLogger->debug(print_r($data,1));

Model/Method/Oneclick.php

@@ -63,15 +63,21 @@ class Oneclick extends \Adyen\Payment\Model\Method\Cc
     public function assignData(\Magento\Framework\DataObject $data)
     {
         parent::assignData($data);
+
+        if (!$data instanceof \Magento\Framework\DataObject) {
+            $data = new \Magento\Framework\DataObject($data);
+        }
+
+        $additionalData = $data->getAdditionalData();
         $infoInstance = $this->getInfoInstance();
 
         // get from variant magento code for creditcard type and set this in ccType
-        $variant = $data['variant'];
+        $variant = $additionalData['variant'];
         $ccType = $this->_adyenHelper->getMagentoCreditCartType($variant);
         $infoInstance->setCcType($ccType);
 
         // save value remember details checkbox
-        $infoInstance->setAdditionalInformation('recurring_detail_reference', $data['recurring_detail_reference']);
+        $infoInstance->setAdditionalInformation('recurring_detail_reference', $additionalData['recurring_detail_reference']);
 
         $recurringPaymentType = $this->_adyenHelper->getAdyenOneclickConfigData('recurring_payment_type');
         if($recurringPaymentType == \Adyen\Payment\Model\RecurringType::ONECLICK) {

Model/Method/Pos.php

@@ -201,7 +201,6 @@ class Pos extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa
     public function assignData(\Magento\Framework\DataObject $data)
     {
         parent::assignData($data);
-        $infoInstance = $this->getInfoInstance();
         return $this;
     }
 

Model/Method/Sepa.php

@@ -130,12 +130,16 @@ class Sepa extends \Magento\Payment\Model\Method\AbstractMethod
     {
         parent::assignData($data);
 
-        // set data to additionalInformation
+        if (!$data instanceof \Magento\Framework\DataObject) {
+            $data = new \Magento\Framework\DataObject($data);
+        }
+
+        $additionalData = $data->getAdditionalData();
         $infoInstance = $this->getInfoInstance();
-        $infoInstance->setAdditionalInformation('account_name', $data['account_name']);
-        $infoInstance->setAdditionalInformation('iban', $data['iban']);
-        $infoInstance->setAdditionalInformation('country', $data['country']);
-        $infoInstance->setAdditionalInformation('accept_sepa', $data['accept_sepa']);
+        $infoInstance->setAdditionalInformation('account_name', $additionalData['account_name']);
+        $infoInstance->setAdditionalInformation('iban', $additionalData['iban']);
+        $infoInstance->setAdditionalInformation('country', $additionalData['country']);
+        $infoInstance->setAdditionalInformation('accept_sepa', $additionalData['accept_sepa']);
     }
 
     /**