Adding storeId param to getOrigin() calls (#806)

Co-authored-by: Attila Kiss <42297201+cyattilakiss@users.noreply.github.com>

Gateway/Request/RedirectDataBuilder.php

@@ -58,7 +58,11 @@ class RedirectDataBuilder implements BuilderInterface
      */
     public function build(array $buildSubject)
     {
-        $request['body'] = $this->adyenRequestsHelper->buildRedirectData([]);
+        /** @var \Magento\Payment\Gateway\Data\PaymentDataObject $paymentDataObject */
+        $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($buildSubject);
+        $payment = $paymentDataObject->getPayment();
+        $storeId = $payment->getOrder()->getStoreId();
+        $request['body'] = $this->adyenRequestsHelper->buildRedirectData($storeId, []);
 
         return $request;
     }

Helper/Data.php

@@ -1571,8 +1571,8 @@ class Data extends AbstractHelper
      */
     public function getOriginKeyForBaseUrl()
     {
-        $origin = $this->getOrigin();
         $storeId = $this->storeManager->getStore()->getId();
+        $origin = $this->getOrigin($storeId);
         $cacheKey = 'Adyen_origin_key_for_' . $origin . '_' . $storeId;
 
         if (!$originKey = $this->cache->load($cacheKey)) {

Helper/Requests.php

@@ -345,11 +345,11 @@ class Requests extends AbstractHelper
      * @param array $request
      * @return array
      */
-    public function buildRedirectData($request = [])
+    public function buildRedirectData($storeId, $request = [])
     {
         $request['redirectFromIssuerMethod'] = 'GET';
         $request['redirectToIssuerMethod'] = 'POST';
-        $request['returnUrl'] = $this->adyenHelper->getOrigin() . '/adyen/process/redirect';
+        $request['returnUrl'] = $this->adyenHelper->getOrigin($storeId) . '/adyen/process/redirect';
 
         return $request;
     }