Merge pull request #273 from Adyen/dl-storeview

Use store scope when populating HPP methods

Helper/PaymentMethods.php

@@ -154,10 +154,16 @@ class PaymentMethods extends AbstractHelper
     {
         $paymentMethods = [];
 
-        $ccEnabled = $this->_config->getValue('payment/'.\Adyen\Payment\Model\Ui\AdyenCcConfigProvider::CODE.'/active');
+        $ccEnabled = $this->_config->getValue(
+            'payment/' . \Adyen\Payment\Model\Ui\AdyenCcConfigProvider::CODE . '/active',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
+            $store->getCode()
+        );
         $ccTypes = array_keys($this->_adyenHelper->getCcTypesAltData());
         $sepaEnabled = $this->_config->getValue(
-            'payment/'.\Adyen\Payment\Model\Ui\AdyenSepaConfigProvider::CODE.'/active'
+            'payment/' . \Adyen\Payment\Model\Ui\AdyenSepaConfigProvider::CODE . '/active',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
+            $store->getCode()
         );
 
         foreach ($this->_fetchHppMethods($store, $country) as $methodCode => $methodData) {
@@ -192,7 +198,7 @@ class PaymentMethods extends AbstractHelper
         }
 
         $adyFields = [
-            "paymentAmount"     => (int) $this->_adyenHelper->formatAmount(
+            "paymentAmount" => (int)$this->_adyenHelper->formatAmount(
                 $this->_getCurrentPaymentAmount(),
                 $this->_getCurrentCurrencyCode($store)
             ),
@@ -228,9 +234,9 @@ class PaymentMethods extends AbstractHelper
                     $themeCode = "Magento/blank";
 
                     $themeId = $this->_design->getConfigurationDesignTheme(\Magento\Framework\App\Area::AREA_FRONTEND);
-                    if(!empty($themeId)) {
+                    if (!empty($themeId)) {
                         $theme = $this->_themeProvider->getThemeById($themeId);
-                        if($theme && !empty($theme->getCode())) {
+                        if ($theme && !empty($theme->getCode())) {
                             $themeCode = $theme->getCode();
                         }
                     }