Merge branch 'develop' into ECP-8715

Adyen · Feb 2, 2024 · adfc0fe · adfc0fe
2 parents 1330153 + 80a1f75
commit adfc0fe
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/Model/GetAdyenPaymentMethodsByProduct.php b/Model/GetAdyenPaymentMethodsByProduct.php
@@ -80,9 +80,9 @@ public function execute(
         if (!$store) {
             return [];
         }
-        $merchantAccount = $this->adyenHelper->getAdyenAbstractConfigData(
+        $merchantAccount = $this->adyenConfigHelper->getAdyenAbstractConfigData(
             'merchant_account',
-            $store->getId()
+            (int)$store->getId()
         );
         if (!$merchantAccount) {
             return [];
@@ -138,9 +138,9 @@ public function execute(
     private function getCurrentCountryCode(
         StoreInterface $store
     ): string {
-        $countryCode = $this->adyenHelper->getAdyenHppConfigData(
+        $countryCode = $this->adyenConfigHelper->getAdyenHppConfigData(
             'country',
-            $store->getId()
+            (int)$store->getId()
         );
         if ($countryCode) {
             return $countryCode;

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "adyen/adyen-magento2-expresscheckout",
   "description": "Official Adyen Magento2 plugin to add express payment method shortcuts.",
   "type": "magento2-module",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "license": "MIT",
   "repositories": [
     {

diff --git a/etc/module.xml b/etc/module.xml
@@ -11,7 +11,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Adyen_ExpressCheckout" setup_version="2.0.1">
+    <module name="Adyen_ExpressCheckout" setup_version="2.0.2">
         <sequence>
             <module name="Adyen_Payment"/>
         </sequence>

diff --git a/view/frontend/web/js/googlepay/button.js b/view/frontend/web/js/googlepay/button.js
@@ -29,6 +29,8 @@ define([
     'Adyen_ExpressCheckout/js/helpers/redirectToSuccess',
     'Adyen_ExpressCheckout/js/helpers/setExpressMethods',
     'Adyen_ExpressCheckout/js/helpers/validatePdpForm',
+    'Adyen_ExpressCheckout/js/helpers/getMaskedIdFromCart',
+    'Adyen_ExpressCheckout/js/model/maskedId',
     'Adyen_ExpressCheckout/js/model/config',
     'Adyen_ExpressCheckout/js/model/countries',
     'Adyen_ExpressCheckout/js/model/totals',
@@ -66,6 +68,8 @@ define([
         redirectToSuccess,
         setExpressMethods,
         validatePdpForm,
+        getMaskedIdFromCart,
+        maskedIdModel,
         configModel,
         countriesModel,
         totalsModel,
@@ -407,7 +411,8 @@ define([
                             .done( function (orderId) {
                                 if (!!orderId) {
                                     self.orderId = orderId;
-                                    adyenPaymentService.getOrderPaymentStatus(orderId).
+                                    let quoteId = self.isProductView ? maskedIdModel().getMaskedId() : getMaskedIdFromCart();
+                                    adyenPaymentService.getOrderPaymentStatus(orderId, quoteId).
                                     done(function (responseJSON) {
                                         self.handleAdyenResult(responseJSON, orderId);
                                     })