Merge remote-tracking branch 'origin/MAGETWO-44965' into BUGS

slavvka · slavvka · commit 0421bc765afe · 2015-11-04T20:43:57.000+02:00
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -543,6 +543,7 @@ protected function _prepareDataForUpdate(array $rowData)
         }
 
         // let's try to find region ID
+        $entityRow['region_id'] = null;
         if (!empty($rowData[self::COLUMN_REGION])) {
             $countryNormalized = strtolower($rowData[self::COLUMN_COUNTRY_ID]);
             $regionNormalized = strtolower($rowData[self::COLUMN_REGION]);
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/address_import_update.csv b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/address_import_update.csv
@@ -2,3 +2,4 @@
 "admin","BetsyParker@example.com",1,,,"US",,"Katy","Parker","T.",19107,,,,"1079 Rocky Road",,"215-629-9720",,,,,,,1
 "admin","BetsyParker@example.com",3,"Phoenix",,"US",,"Brad","Brown","H.",85034,,"Arizona",4,"4225 Martha Street",,"928-707-1577",,,,,,1,
 "admin","BetsyParker@example.com",,"Tallahassee",,"US",,"William ","Compton","M.",32301,,"Florida",18,"1973 Drainer Avenue",,"850-590-7403",,,,,,,
+"admin","BetsyParker@example.com",,"Tallahassee",,"UA",,"An ","Compton","M.",32301,,,18,"1973 Drainer Avenue",,"850-590-7403",,,,,,,

Original file line number	Diff line number	Diff line change
`@@ -543,6 +543,7 @@ protected function _prepareDataForUpdate(array $rowData)`
`543`	`543`	`}`
`544`	`544`
`545`	`545`	`// let's try to find region ID`
	`546`	`+ $entityRow['region_id'] = null;`
`546`	`547`	`if (!empty($rowData[self::COLUMN_REGION])) {`
`547`	`548`	`$countryNormalized = strtolower($rowData[self::COLUMN_COUNTRY_ID]);`
`548`	`549`	`$regionNormalized = strtolower($rowData[self::COLUMN_REGION]);`