Merge remote-tracking branch 'gl_magento2ce/AC-3145' into DHL-AC-3145-JUNE-3-2022

Author: glo05363

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

@@ -1580,8 +1580,13 @@ protected function _doRequest()
          * Shipment bill to account – required if Shipping PaymentType is other than 'S'
          */
         $nodeBilling->addChild('BillingAccountNumber', (string)$this->getConfigData('account'));
-        $nodeBilling->addChild('DutyPaymentType', 'S');
-        $nodeBilling->addChild('DutyAccountNumber', (string)$this->getConfigData('account'));
+        if ($this->isDutiable(
+            $rawRequest->getShipperAddressCountryCode(),
+            $rawRequest->getRecipientAddressCountryCode()
+        )) {
+            $nodeBilling->addChild('DutyPaymentType', 'S');
+            $nodeBilling->addChild('DutyAccountNumber', (string)$this->getConfigData('account'));
+        }
 
         /** Receiver */
         $nodeConsignee = $xml->addChild('Consignee', '', '');
@@ -1789,7 +1794,10 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
         $contentType = isset($package['params']['container']) ? $package['params']['container'] : '';
         $packageType = $contentType === self::DHL_CONTENT_TYPE_NON_DOC ? 'CP' : 'EE';
         $nodeShipmentDetails->addChild('PackageType', $packageType);
-        if ($this->isDutiable($rawRequest->getOrigCountryId(), $rawRequest->getDestCountryId())) {
+        if ($this->isDutiable(
+            $rawRequest->getShipperAddressCountryCode(),
+            $rawRequest->getRecipientAddressCountryCode()
+        )) {
             $nodeShipmentDetails->addChild('IsDutiable', 'Y');
         }
         $nodeShipmentDetails->addChild(
@@ -2044,9 +2052,8 @@ protected function _checkDomesticStatus($origCountryCode, $destCountryCode)
 
         $origCountry = (string)$this->getCountryParams($origCountryCode)->getData('name');
         $destCountry = (string)$this->getCountryParams($destCountryCode)->getData('name');
-        $isDomestic = (string)$this->getCountryParams($destCountryCode)->getData('domestic');
 
-        if (($origCountry == $destCountry && $isDomestic)
+        if (($origCountry == $destCountry)
             || (
                 $this->_carrierHelper->isCountryInEU($origCountryCode)
                 && $this->_carrierHelper->isCountryInEU($destCountryCode)

dev/tests/integration/testsuite/Magento/Dhl/_files/domestic_shipment_request.xml

@@ -28,8 +28,6 @@
         <ShipperAccountNumber>1234567890</ShipperAccountNumber>
         <ShippingPaymentType>S</ShippingPaymentType>
         <BillingAccountNumber>1234567890</BillingAccountNumber>
-        <DutyPaymentType>S</DutyPaymentType>
-        <DutyAccountNumber>1234567890</DutyAccountNumber>
     </Billing>
     <Consignee xmlns="">
         <CompanyName/>