Merge branch '2.2-develop' of https://github.com/magento/magento2ce into 2.2.4-preview

Author: Magento Team

app/code/Magento/Braintree/composer.json

@@ -18,7 +18,7 @@
         "magento/module-quote": "101.0.*",
         "magento/module-paypal": "100.2.*",
         "magento/module-ui": "101.0.*",
-        "braintree/braintree_php": "3.27.0"
+        "braintree/braintree_php": "3.28.0"
     },
     "suggest": {
         "magento/module-checkout-agreements": "100.2.*",

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

@@ -1409,7 +1409,9 @@ protected function _doRequest()
         if (!$originRegion) {
             $xml->addChild('RequestedPickupTime', 'N', '');
         }
-        $xml->addChild('NewShipper', 'N', '');
+        if ($originRegion !== 'AP') {
+            $xml->addChild('NewShipper', 'N', '');
+        }
         $xml->addChild('LanguageCode', 'EN', '');
         $xml->addChild('PiecesEnabled', 'Y', '');
 
@@ -1451,7 +1453,9 @@ protected function _doRequest()
         }
 
         $nodeConsignee->addChild('City', $rawRequest->getRecipientAddressCity());
-        $nodeConsignee->addChild('Division', $rawRequest->getRecipientAddressStateOrProvinceCode());
+        if ($originRegion !== 'AP') {
+            $nodeConsignee->addChild('Division', $rawRequest->getRecipientAddressStateOrProvinceCode());
+        }
         $nodeConsignee->addChild('PostalCode', $rawRequest->getRecipientAddressPostalCode());
         $nodeConsignee->addChild('CountryCode', $rawRequest->getRecipientAddressCountryCode());
         $nodeConsignee->addChild(
@@ -1500,7 +1504,9 @@ protected function _doRequest()
         $nodeShipper = $xml->addChild('Shipper', '', '');
         $nodeShipper->addChild('ShipperID', (string)$this->getConfigData('account'));
         $nodeShipper->addChild('CompanyName', $rawRequest->getShipperContactCompanyName());
-        $nodeShipper->addChild('RegisteredAccount', (string)$this->getConfigData('account'));
+        if ($originRegion !== 'AP') {
+            $nodeShipper->addChild('RegisteredAccount', (string)$this->getConfigData('account'));
+        }
 
         $address = $rawRequest->getShipperAddressStreet1() . ' ' . $rawRequest->getShipperAddressStreet2();
         $address = $this->string->split($address, 35, false, true);
@@ -1513,7 +1519,9 @@ protected function _doRequest()
         }
 
         $nodeShipper->addChild('City', $rawRequest->getShipperAddressCity());
-        $nodeShipper->addChild('Division', $rawRequest->getShipperAddressStateOrProvinceCode());
+        if ($originRegion !== 'AP') {
+            $nodeShipper->addChild('Division', $rawRequest->getShipperAddressStateOrProvinceCode());
+        }
         $nodeShipper->addChild('PostalCode', $rawRequest->getShipperAddressPostalCode());
         $nodeShipper->addChild('CountryCode', $rawRequest->getShipperAddressCountryCode());
         $nodeShipper->addChild(
@@ -1533,7 +1541,7 @@ protected function _doRequest()
 
         $responseBody = $this->_getCachedQuotes($request);
         if ($responseBody === null) {
-            $debugData = ['request' => $request];
+            $debugData = ['request' => $this->filterDebugData($request)];
             try {
                 /** @var \Magento\Framework\HTTP\ZendClient $client */
                 $client = $this->_httpClientFactory->create();
@@ -1542,7 +1550,7 @@ protected function _doRequest()
                 $client->setRawData($request);
                 $responseBody = $client->request(\Magento\Framework\HTTP\ZendClient::POST)->getBody();
                 $responseBody = utf8_decode($responseBody);
-                $debugData['result'] = $responseBody;
+                $debugData['result'] = $this->filterDebugData($responseBody);
                 $this->_setCachedQuotes($request, $responseBody);
             } catch (\Exception $e) {
                 $this->_errors[$e->getCode()] = $e->getMessage();
@@ -1727,15 +1735,15 @@ protected function _getXMLTracking($trackings)
 
         $responseBody = $this->_getCachedQuotes($request);
         if ($responseBody === null) {
-            $debugData = ['request' => $request];
+            $debugData = ['request' => $this->filterDebugData($request)];
             try {
                 /** @var \Magento\Framework\HTTP\ZendClient $client */
                 $client = $this->_httpClientFactory->create();
                 $client->setUri((string)$this->getConfigData('gateway_url'));
                 $client->setConfig(['maxredirects' => 0, 'timeout' => 30]);
                 $client->setRawData($request);
                 $responseBody = $client->request(\Magento\Framework\HTTP\ZendClient::POST)->getBody();
-                $debugData['result'] = $responseBody;
+                $debugData['result'] = $this->filterDebugData($responseBody);
                 $this->_setCachedQuotes($request, $responseBody);
             } catch (\Exception $e) {
                 $this->_errors[$e->getCode()] = $e->getMessage();