ENGCOM-2439: [Forwardport] Improve "Invalid country code" error message on tax import #16961

Stanislav Idolov · web-flow · commit baee8c447f35 · 2018-07-20T16:12:50.000+03:00
diff --git a/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php b/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
@@ -237,7 +237,7 @@ protected function _importRate(array $rateData, array $regionsCache, array $stor
         $countryCode = $rateData[1];
         $country = $this->_countryFactory->create()->loadByCode($countryCode, 'iso2_code');
         if (!$country->getId()) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('One of the countries has invalid code.'));
+            throw new \Magento\Framework\Exception\LocalizedException(__('Country code is invalid: %1', $countryCode));
         }
         $regionsCache = $this->_addCountryRegionsToCache($countryCode, $regionsCache);
 
diff --git a/app/code/Magento/TaxImportExport/i18n/en_US.csv b/app/code/Magento/TaxImportExport/i18n/en_US.csv
@@ -12,7 +12,7 @@ Rate,Rate
 "Invalid file upload attempt","Invalid file upload attempt"
 "Invalid file upload attempt.","Invalid file upload attempt."
 "Invalid file format.","Invalid file format."
-"One of the countries has invalid code.","One of the countries has invalid code."
+"Country code is invalid: %1","Country code is invalid: %1"
 "Import Tax Rates","Import Tax Rates"
 "Export Tax Rates","Export Tax Rates"
 CSV,CSV
diff --git a/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php b/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php
@@ -57,7 +57,7 @@ public function testImportFromCsvFileWithCorrectData()
     /**
      * @magentoDbIsolation enabled
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage One of the countries has invalid code.
+     * @expectedExceptionMessage Country code is invalid: ZZ
      */
     public function testImportFromCsvFileThrowsExceptionWhenCountryCodeIsInvalid()
     {

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ protected function _importRate(array $rateData, array $regionsCache, array $stor`
`237`	`237`	`$countryCode = $rateData[1];`
`238`	`238`	`$country = $this->_countryFactory->create()->loadByCode($countryCode, 'iso2_code');`
`239`	`239`	`if (!$country->getId()) {`
`240`		`- throw new \Magento\Framework\Exception\LocalizedException(__('One of the countries has invalid code.'));`
	`240`	`+ throw new \Magento\Framework\Exception\LocalizedException(__('Country code is invalid: %1', $countryCode));`
`241`	`241`	`}`
`242`	`242`	`$regionsCache = $this->_addCountryRegionsToCache($countryCode, $regionsCache);`
`243`	`243`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function testImportFromCsvFileWithCorrectData()`
`57`	`57`	`/**`
`58`	`58`	`* @magentoDbIsolation enabled`
`59`	`59`	`* @expectedException \Magento\Framework\Exception\LocalizedException`
`60`		`- * @expectedExceptionMessage One of the countries has invalid code.`
	`60`	`+ * @expectedExceptionMessage Country code is invalid: ZZ`
`61`	`61`	`*/`
`62`	`62`	`public function testImportFromCsvFileThrowsExceptionWhenCountryCodeIsInvalid()`
`63`	`63`	`{`