Skip to content

Commit de0db4d

Browse files
author
Joan He
committed
Merge remote-tracking branch 'origin/MAGETWO-90632' into BugFixPR
2 parents a756249 + a8e5de8 commit de0db4d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

app/code/Magento/Dhl/Model/Carrier.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
232232
* @param \Magento\Framework\Stdlib\DateTime $dateTime
233233
* @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
234234
* @param array $data
235-
* @param \Magento\Dhl\Model\Validator\XmlValidatorFactory $xmlValidatorFactory
235+
* @param \Magento\Dhl\Model\Validator\XmlValidator $xmlValidator
236236
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
237237
*/
238238
public function __construct(
@@ -1970,6 +1970,6 @@ protected function isDutiable($origCountryId, $destCountryId)
19701970

19711971
return
19721972
self::DHL_CONTENT_TYPE_NON_DOC == $this->getConfigData('content_type')
1973-
&& !$this->_isDomestic;
1973+
|| !$this->_isDomestic;
19741974
}
19751975
}

0 commit comments

Comments
 (0)