Merge pull request #10 from limegrow/feature/bump-2.7.0

Bump v2.7.0
limegrow · Apr 18, 2021 · 92e601c · 92e601c
2 parents b1ab8ec + 9a7f58c
commit 92e601c
Show file tree

Hide file tree

Showing 64 changed files with 1,928 additions and 627 deletions.
diff --git a/Block/Form/Flex.php b/Block/Form/Flex.php
@@ -2,11 +2,6 @@
 
 namespace Ingenico\Payment\Block\Form;
 
-use Ingenico\Payment\Model\Config as IngenicoConfig;
-use Ingenico\Payment\Model\IngenicoConfigProvider;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\View\Element\Template;
-
 class Flex extends Method
 {
     protected $_template = 'form/flex.phtml';
@@ -16,7 +11,8 @@ class Flex extends Method
      *
      * @return array
      */
-    public function getFlexMethods() {
-        return $this->cnf->getFlexMethods();
+    public function getFlexMethods()
+    {
+        return $this->cnf->getFlexMethods($this->_storeManager->getStore()->getId());
     }
 }
diff --git a/Block/Form/Ideal.php b/Block/Form/Ideal.php
@@ -13,7 +13,8 @@ class Ideal extends Method
      *
      * @return array
      */
-    public function getAvailableBanks() {
+    public function getAvailableBanks()
+    {
         return ObjectManager::getInstance()->get('Ingenico\Payment\Block\Ideal\Banks')->getAvailableBanks();
     }
 }
diff --git a/Block/Form/Method.php b/Block/Form/Method.php
@@ -48,6 +48,6 @@ public function __construct(
      */
     public function isPaymentPageModeRedirect()
     {
-        return $this->cnf->isPaymentPageModeRedirect();
+        return $this->cnf->isPaymentPageModeRedirect($this->_storeManager->getStore()->getId());
     }
 }
diff --git a/Block/Ideal/Banks.php b/Block/Ideal/Banks.php
@@ -6,6 +6,8 @@
 use Magento\Widget\Block\BlockInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Ingenico\Payment\Model\Config;
 
 class Banks extends AbstractBlock implements BlockInterface
 {
@@ -74,20 +76,23 @@ public function getAvailableBanks()
         $om = ObjectManager::getInstance();
 
         /** @var \Ingenico\Payment\Model\Config $config */
-        $config = $om->get('Ingenico\Payment\Model\Config');
+        $config = $om->get(Config::class);
 
-        $banks = $config->getIDealBanks();
+        /** @var \Magento\Store\Model\StoreManagerInterface $storeManger */
+        $storeManger = $om->get(StoreManagerInterface::class);
+
+        $banks = $config->getIDealBanks($storeManger->getStore()->getId());
 
         /** @var \Ingenico\Payment\Model\Config\Source\Ideal\Banks $source */
-        $source = $om->get('Ingenico\Payment\Model\Config\Source\Ideal\Banks');
+        $source = $om->get(\Ingenico\Payment\Model\Config\Source\Ideal\Banks::class);
         // @codingStandardsIgnoreEnd
 
         // Get Banks
         $options = $source->toOptionArray();
 
         $result = [];
         foreach ($options as $option) {
-            if (in_array($option['value'], $banks)) {
+            if (empty($option['value']) || in_array($option['value'], $banks)) {
                 $result[] = $option;
             }
         }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.7.0] - 2021-04-18
+### Added
+- Multi Store configuration
+- New option: Layout of Payment Methods
+- Clean config cache automatically on settings save
+- Multishipping: "Remove" button which allows removing saved alias
+
+### Changes
+- iDeal bufixes
+- Blank payment method bugfixes
+- "Pay with Saved Card" bugfixes
+- Update Klarna translations
+- Multishipping: Fixed missing brand of CC on alias payment
+- Require billing address for Bancontact
+
 ## [2.6.0] - 2021-03-25
 ### Added
 - "Remove" button which allows removing saved alias

diff --git a/Controller/Payment/Inline.php b/Controller/Payment/Inline.php
@@ -61,7 +61,7 @@ public function execute()
             } else {
                 // Credit Card time
                 $orderId = $this->_session->getData('last_real_order_id');
-                if ($this->_cnf->isPaymentPageModeInline() && $this->_connector->isOrderCreated($orderId)) {
+                if ($this->_cnf->isPaymentPageModeInline($order->getStoreId()) && $this->_connector->isOrderCreated($orderId)) {
                     $response = $this->_connector->finishReturnInline(
                         $orderId,
                         $this->getRequest()->getParam('cardbrand'),

diff --git a/Controller/Payment/Redirect.php b/Controller/Payment/Redirect.php
@@ -20,18 +20,34 @@ public function execute()
         $corePaymentMethod = $this->ingenicoHelper->getCoreMethod($paymentMethodInstance::CORE_CODE);
 
         try {
-            if (in_array($paymentMethodInstance->getCode(), [
-                \Ingenico\Payment\Model\Method\Ingenico::PAYMENT_METHOD_CODE,
-                \Ingenico\Payment\Model\Method\Alias::PAYMENT_METHOD_CODE
-            ])) {
+            if (\Ingenico\Payment\Model\Method\Ingenico::PAYMENT_METHOD_CODE === $paymentMethodInstance->getCode()) {
                 // @see self::showPaymentListRedirectTemplate()
                 $this->_connector->processPaymentRedirect($aliasId);
-            } elseif ($paymentMethodInstance->getCode() === \Ingenico\Payment\Model\Method\Cc::PAYMENT_METHOD_CODE) {
+            } elseif (\Ingenico\Payment\Model\Method\Cc::PAYMENT_METHOD_CODE === $paymentMethodInstance->getCode()) {
                 // @see self::showPaymentListRedirectTemplate()
+                if ($aliasId) {
+                    // There's specified card brand
+                    $alias = $this->_connector->getAlias($aliasId);
+                    $this->_connector->processPaymentRedirectSpecified(
+                        $aliasId,
+                        'CreditCard',
+                        $alias['brand']
+                    );
+                } else {
+                    // Use "CreditCard" brands
+                    $this->_connector->processPaymentRedirectSpecified(
+                        $aliasId,
+                        'CreditCard',
+                        'CreditCard'
+                    );
+                }
+            } elseif (\Ingenico\Payment\Model\Method\Alias::PAYMENT_METHOD_CODE === $paymentMethodInstance->getCode()) {
+                // @see self::showPaymentListRedirectTemplate()
+                $alias = $this->_connector->getAlias($aliasId);
                 $this->_connector->processPaymentRedirectSpecified(
                     $aliasId,
                     'CreditCard',
-                    'CreditCard'
+                    $alias['brand']
                 );
             } elseif ($corePaymentMethod) {
                 // @see self::showPaymentListRedirectTemplate()

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -156,4 +156,14 @@ public function getActiveMagentoPaymentMethods()
 
         return $result;
     }
+
+    /**
+     * Get Store ID.
+     *
+     * @return string
+     */
+    public function getStoreId()
+    {
+        return $this->storeManager->getStore()->getId();
+    }
 }