Merge branch 'release/v6.3.1' into 'master'

release/v6.3.1 into master See merge request agence-dnd/marketplace/magento-2/external/module-checkout-magento2-plugin!227
checkout · Aug 14, 2024 · e6575e2 · e6575e2
2 parents 3c8d781 + 6fee32c
commit e6575e2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Gateway/Config/Config.php b/Gateway/Config/Config.php
@@ -314,7 +314,7 @@ public function getMethodsConfig(): array
     {
         $output = [];
         /** @var array $paymentMethodsConfig */
-        $paymentMethodsConfig = $this->scopeConfig->getValue(Loader::KEY_PAYMENT, ScopeInterface::SCOPE_WEBSITE);
+        $paymentMethodsConfig = $this->scopeConfig->getValue(Loader::KEY_PAYMENT, ScopeInterface::SCOPE_STORE);
 
         /**
          * Get only the active CheckoutCom methods
@@ -568,12 +568,12 @@ public function isAbcRefundAfterNasMigrationActive($storeCode = null): bool
     }
 
     /**
-     * @param int $storeCode
+     * @param string $storeCode
      * @param string $scope
      *
      * @return Environment
      */
-    public function getEnvironment(int $storeCode, string $scope): Environment
+    public function getEnvironment(string $storeCode, string $scope): Environment
     {
         if ((int)$this->getValue('environment', null, $storeCode, $scope) === 1) {
             return Environment::sandbox();

diff --git a/Model/Service/ApiHandlerService.php b/Model/Service/ApiHandlerService.php
@@ -181,7 +181,7 @@ public function init(
         }
 
         $service = $this->scopeConfig->getValue(ConfigService::SERVICE_CONFIG_PATH, $scope, $storeCode);
-        $environment = $this->config->getEnvironment((int)$storeCode, $scope);
+        $environment = $this->config->getEnvironment($storeCode, $scope);
         $api = CheckoutSdk::builder();
 
         if ($service === ConfigService::SERVICE_ABC) {
@@ -208,7 +208,7 @@ public function initAbcForRefund(
         $publicKey = $this->config->getValue('abc_refund_public_key', null, $storeCode, $scope);
 
         $api = CheckoutSdk::builder();
-        $environment = $this->config->getEnvironment((int)$storeCode, $scope);
+        $environment = $this->config->getEnvironment($storeCode, $scope);
 
         $this->checkoutApi = $api
             ->previous()->staticKeys()

diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
         "magento/framework": ">=100.0.1"
     },
     "type": "magento2-module",
-    "version": "6.3.0",
+    "version": "6.3.1",
     "autoload": {
         "files": [
             "registration.php"