MAGETWO-38512: DHL does not return Non-Document shipping methods across EU

Viktor Tymchynskyi · Viktor Tymchynskyi · commit fde44a6da021 · 2015-09-15T12:44:15.000+03:00
-  Make internal shipping in EU domestic
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
@@ -1921,7 +1921,11 @@ protected function _checkDomesticStatus($origCountryCode, $destCountryCode)
         $destCountry = (string)$this->getCountryParams($destCountryCode)->getData('name');
         $isDomestic = (string)$this->getCountryParams($destCountryCode)->getData('domestic');
 
-        if ($origCountry == $destCountry && $isDomestic) {
+        if (($origCountry == $destCountry && $isDomestic)
+            || ($this->_carrierHelper->isCountryInEU($origCountryCode)
+                && $this->_carrierHelper->isCountryInEU($destCountryCode)
+            )
+        ) {
             $this->_isDomestic = true;
         }
 
@@ -1964,7 +1968,6 @@ protected function isDutiable($origCountryId, $destCountryId)
 
         return
             self::DHL_CONTENT_TYPE_NON_DOC == $this->getConfigData('content_type')
-            && !$this->_isDomestic
-            && !$this->_carrierHelper->isCountryInEU($destCountryId);
+            && !$this->_isDomestic;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1921,7 +1921,11 @@ protected function _checkDomesticStatus($origCountryCode, $destCountryCode)`
`1921`	`1921`	`$destCountry = (string)$this->getCountryParams($destCountryCode)->getData('name');`
`1922`	`1922`	`$isDomestic = (string)$this->getCountryParams($destCountryCode)->getData('domestic');`
`1923`	`1923`
`1924`		`- if ($origCountry == $destCountry && $isDomestic) {`
	`1924`	`+ if (($origCountry == $destCountry && $isDomestic)`
	`1925`	`+ \|\| ($this->_carrierHelper->isCountryInEU($origCountryCode)`
	`1926`	`+ && $this->_carrierHelper->isCountryInEU($destCountryCode)`
	`1927`	`+ )`
	`1928`	`+ ) {`
`1925`	`1929`	`$this->_isDomestic = true;`
`1926`	`1930`	`}`
`1927`	`1931`
`@@ -1964,7 +1968,6 @@ protected function isDutiable($origCountryId, $destCountryId)`
`1964`	`1968`
`1965`	`1969`	`return`
`1966`	`1970`	`self::DHL_CONTENT_TYPE_NON_DOC == $this->getConfigData('content_type')`
`1967`		`- && !$this->_isDomestic`
`1968`		`- && !$this->_carrierHelper->isCountryInEU($destCountryId);`
	`1971`	`+ && !$this->_isDomestic;`
`1969`	`1972`	`}`
`1970`	`1973`	`}`