Merge pull request #444 from Adyen/develop

Release 4.1.0
Adyen · May 10, 2019 · e2b3882 · e2b3882
2 parents dc96f65 + d093080
commit e2b3882
Show file tree

Hide file tree

Showing 115 changed files with 4,095 additions and 4,739 deletions.
diff --git a/Block/Checkout/Success.php b/Block/Checkout/Success.php
@@ -76,9 +76,8 @@ protected function _toHtml()
                     'boleto_pdf_url' => $this->getBoletoPdfUrl()
                 ]
             );
-            return parent::_toHtml();
         }
-        return '';
+        return parent::_toHtml();
     }
 
     /**
@@ -105,6 +104,42 @@ public function getBoletoPdfUrl()
         return null;
     }
 
+    /**
+     * Get Banktransfer additional data
+     *
+     * @return array|string[]
+     */
+    public function getBankTransferData()
+    {
+        $result = [];
+        if (!empty($this->getOrder()->getPayment()) &&
+            !empty($this->getOrder()->getPayment()->getAdditionalInformation('bankTransfer.owner'))
+        ) {
+            $result = $this->getOrder()->getPayment()->getAdditionalInformation();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get multibanco additional data
+     *
+     * @return array|string[]
+     */
+    public function getMultibancoData()
+    {
+        $result = [];
+        if (!empty($this->getOrder()->getPayment()) &&
+            !empty($this->getOrder()->getPayment()->getAdditionalInformation('comprafacil.entity'))
+        ) {
+            $result = $this->getOrder()->getPayment()->getAdditionalInformation();
+        }
+
+        return $result;
+    }
+
+
+
     /**
      * @return \Magento\Sales\Model\Order
      */

diff --git a/Block/Form/Sepa.php b/Block/Form/Sepa.php
diff --git a/Block/Info/Hpp.php b/Block/Info/Hpp.php
@@ -31,13 +31,48 @@ class Hpp extends AbstractInfo
     protected $_template = 'Adyen_Payment::info/adyen_hpp.phtml';
 
     /**
-     * Check if Payment method selection is configured on Adyen or Magento
+     * Get all Banktransfer related data
      *
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function getBankTransferData()
+    {
+        $result = [];
+        if (!empty($this->getInfo()->getOrder()->getPayment()) &&
+            !empty($this->getInfo()->getOrder()->getPayment()->getAdditionalInformation('bankTransfer.owner'))
+        ) {
+            $result = $this->getInfo()->getOrder()->getPayment()->getAdditionalInformation();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get all multibanco related data
+     *
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function getMultibancoData()
+    {
+        $result = [];
+        if (!empty($this->getInfo()->getOrder()->getPayment()) &&
+            !empty($this->getInfo()->getOrder()->getPayment()->getAdditionalInformation('comprafacil.entity'))
+        ) {
+            $result = $this->getInfo()->getOrder()->getPayment()->getAdditionalInformation();
+        }
+
+        return $result;
+    }
+
+    /**
      * @return mixed
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function isPaymentSelectionOnAdyen()
+    public function getOrder()
     {
-        return $this->_adyenHelper->getAdyenHppConfigDataFlag('payment_selection_on_adyen');
+        return $this->getInfo()->getOrder();
     }
 
     /**

diff --git a/Block/Info/Sepa.php b/Block/Info/Sepa.php