[PW-978] Fix for HPP not retrieving the correct merchantAccount (#392)

* add $store to retrieve correct merchant account

* add $store to retrieve correct merchant account

* getId

Block/Redirect/Redirect.php

@@ -194,7 +194,7 @@ class Redirect extends \Magento\Payment\Block\Form
                     $this->_order->getGrandTotal(),
                     $orderCurrencyCode
                 );
-                $merchantAccount = trim($this->_adyenHelper->getAdyenAbstractConfigData('merchant_account'));
+                $merchantAccount = trim($this->_adyenHelper->getAdyenAbstractConfigData('merchant_account', $this->_order->getStoreId()));
                 $shopperEmail = $this->_order->getCustomerEmail();
                 $customerId = $this->_order->getCustomerId();
                 $shopperIP = $this->_order->getRemoteIp();

Helper/PaymentMethods.php

@@ -191,7 +191,7 @@ class PaymentMethods extends AbstractHelper
     protected function _fetchHppMethods($store, $country)
     {
         $skinCode = $this->_adyenHelper->getAdyenHppConfigData('skin_code');
-        $merchantAccount = $this->_adyenHelper->getAdyenAbstractConfigData('merchant_account');
+        $merchantAccount = $this->_adyenHelper->getAdyenAbstractConfigData('merchant_account', $store->getId());
 
         if (!$skinCode || !$merchantAccount) {
             return [];