Merge pull request #55 from magento-folks/bugfix

[Folks] Bugfix

Author: Alexander Akimov

app/code/Magento/CustomerSampleData/Model/Customer.php

@@ -268,6 +268,6 @@ protected function convertRowData($row, $data)
     protected function getRegionId($address)
     {
         $country = $this->countryFactory->create()->loadByCode($address['country_id']);
-        return $country->getRegionCollection()->addFieldToFilter('name', $address['region'])->getFirstItem()->getId();
+        return $country->getRegionCollection()->addFieldToFilter('default_name', $address['region'])->getFirstItem()->getId();
     }
 }

app/code/Magento/OfflineShippingSampleData/Model/Tablerate.php

@@ -6,6 +6,8 @@
 namespace Magento\OfflineShippingSampleData\Model;
 
 use Magento\Framework\Setup\SampleData\Context as SampleDataContext;
+use Magento\Framework\App\ObjectManager;
+use Magento\Config\App\Config\Type\System as SystemConfig;
 
 /**
  * Class Tablerate
@@ -57,14 +59,20 @@ class Tablerate
      */
     protected $storeManager;
 
+    /**
+     * @var SystemConfig
+     */
+    private $systemConfig;
+
     /**
      * @param SampleDataContext $sampleDataContext
      * @param \Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate $tablerate
-     * @param \Magento\Framework\App\ResourceModel $resource
+     * @param \Magento\Framework\App\ResourceConnection $resource
      * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollectionFactory
      * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
      * @param \Magento\Framework\App\Config\Storage\WriterInterface $configWriter
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param SystemConfig|null $systemConfig
      */
     public function __construct(
         SampleDataContext $sampleDataContext,
@@ -73,7 +81,8 @@ public function __construct(
         \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollectionFactory,
         \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
         \Magento\Framework\App\Config\Storage\WriterInterface $configWriter,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        SystemConfig $systemConfig = null
     ) {
         $this->fixtureManager = $sampleDataContext->getFixtureManager();
         $this->csvReader = $sampleDataContext->getCsvReader();
@@ -83,6 +92,7 @@ public function __construct(
         $this->cacheTypeList = $cacheTypeList;
         $this->configWriter = $configWriter;
         $this->storeManager = $storeManager;
+        $this->systemConfig = $systemConfig ?: ObjectManager::getInstance()->get(SystemConfig::class);
     }
 
     /**
@@ -138,6 +148,7 @@ public function install(array $fixtures)
         $this->configWriter->save('carriers/tablerate/active', 1);
         $this->configWriter->save('carriers/tablerate/condition_name', 'package_value');
         $this->cacheTypeList->cleanType('config');
+        $this->systemConfig->clean();
     }
 
     /**