🐛 Fix not detecting current store using store code in url

Use $storeManager->getStore()->getId() instead of $storeResolver->getCurrentStoreId()

Author: Marcel Moldovan

app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php

@@ -6,7 +6,7 @@
 namespace Magento\Checkout\Block\Checkout;
 
 use Magento\Directory\Helper\Data as DirectoryHelper;
-use Magento\Store\Api\StoreResolverInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Directory data processor.
@@ -37,9 +37,9 @@ class DirectoryDataProcessor implements \Magento\Checkout\Block\Checkout\LayoutP
     private $countryCollectionFactory;
 
     /**
-     * @var StoreResolverInterface
+     * @var StoreManagerInterface
      */
-    private $storeResolver;
+    private $storeManager;
 
     /**
      * @var DirectoryHelper
@@ -49,18 +49,18 @@ class DirectoryDataProcessor implements \Magento\Checkout\Block\Checkout\LayoutP
     /**
      * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollection
      * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollection
-     * @param StoreResolverInterface $storeResolver
+     * @param StoreManagerInterface $storeManager
      * @param DirectoryHelper $directoryHelper
      */
     public function __construct(
         \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollection,
         \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollection,
-        StoreResolverInterface $storeResolver,
+        StoreManagerInterface $storeManager,
         DirectoryHelper $directoryHelper
     ) {
         $this->countryCollectionFactory = $countryCollection;
         $this->regionCollectionFactory = $regionCollection;
-        $this->storeResolver = $storeResolver;
+        $this->storeManager = $storeManager;
         $this->directoryHelper = $directoryHelper;
     }
 
@@ -91,7 +91,7 @@ private function getCountryOptions()
     {
         if (!isset($this->countryOptions)) {
             $this->countryOptions = $this->countryCollectionFactory->create()->loadByStore(
-                $this->storeResolver->getCurrentStoreId()
+                $this->storeManager->getStore()->getId()
             )->toOptionArray();
             $this->countryOptions = $this->orderCountryOptions($this->countryOptions);
         }
@@ -108,7 +108,7 @@ private function getRegionOptions()
     {
         if (!isset($this->regionOptions)) {
             $this->regionOptions = $this->regionCollectionFactory->create()->addAllowedCountriesFilter(
-                $this->storeResolver->getCurrentStoreId()
+                $this->storeManager->getStore()->getId()
             )->toOptionArray();
         }
 

app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php

@@ -11,9 +11,7 @@
  */
 namespace Magento\Customer\Model\ResourceModel\Address\Attribute\Source;
 
-use Magento\Checkout\Model\Session;
 use Magento\Framework\App\ObjectManager;
-use Magento\Store\Api\StoreResolverInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -28,9 +26,9 @@ class Country extends \Magento\Eav\Model\Entity\Attribute\Source\Table
     protected $_countriesFactory;
 
     /**
-     * @var StoreResolverInterface
+     * @var StoreManagerInterface
      */
-    private $storeResolver;
+    private $storeManager;
 
     /**
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
@@ -55,7 +53,7 @@ public function getAllOptions()
     {
         if (!$this->_options) {
             $this->_options = $this->_createCountriesCollection()->loadByStore(
-                $this->getStoreResolver()->getCurrentStoreId()
+                $this->getStoreManager()->getStore()->getId()
             )->toOptionArray();
         }
         return $this->_options;
@@ -70,16 +68,16 @@ protected function _createCountriesCollection()
     }
 
     /**
-     * Retrieve Store Resolver
+     * Retrieve Store Manager
      * @deprecated
-     * @return StoreResolverInterface
+     * @return StoreManagerInterface
      */
-    private function getStoreResolver()
+    private function getStoreManager()
     {
-        if (!$this->storeResolver) {
-            $this->storeResolver = ObjectManager::getInstance()->get(StoreResolverInterface::class);
+        if (!$this->storeManager) {
+            $this->storeManager = ObjectManager::getInstance()->get(StoreManagerInterface::class);
         }
 
-        return $this->storeResolver;
+        return $this->storeManager;
     }
 }