MAGETWO-38138: Stabilize story

nsyvokonenko · nsyvokonenko · commit ff74f261c647 · 2015-06-12T14:02:07.000+03:00
- fix for import/export
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -522,8 +522,8 @@ protected function _prepareDataForUpdate(array $rowData)
 
             if (isset($this->_countryRegions[$countryNormalized][$regionNormalized])) {
                 $regionId = $this->_countryRegions[$countryNormalized][$regionNormalized];
-                $entityRow[self::COLUMN_REGION] = $regionId;
-                $entityRow[self::COLUMN_COUNTRY_ID] = $this->_regions[$regionId];
+                $entityRow[self::COLUMN_REGION] = $this->_regions[$regionId];
+                $entityRow['region_id'] = $regionId;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -522,8 +522,8 @@ protected function _prepareDataForUpdate(array $rowData)`
`522`	`522`
`523`	`523`	`if (isset($this->_countryRegions[$countryNormalized][$regionNormalized])) {`
`524`	`524`	`$regionId = $this->_countryRegions[$countryNormalized][$regionNormalized];`
`525`		`- $entityRow[self::COLUMN_REGION] = $regionId;`
`526`		`- $entityRow[self::COLUMN_COUNTRY_ID] = $this->_regions[$regionId];`
	`525`	`+ $entityRow[self::COLUMN_REGION] = $this->_regions[$regionId];`
	`526`	`+ $entityRow['region_id'] = $regionId;`
`527`	`527`	`}`
`528`	`528`	`}`
`529`	`529`