Merge remote-tracking branch 'origin/2.3-develop-pr13' into MAGETWO-90327

# Conflicts:
#	app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php

Author: StasKozar

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(

app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php

@@ -32,6 +32,7 @@
 use Magento\Store\Model\Website;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Psr\Log\LoggerInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -115,8 +116,6 @@ protected function setUp()
             ->getMock();
 
         $this->scope = $this->getMockForAbstractClass(ScopeConfigInterface::class);
-        $this->scope->method('getValue')
-            ->willReturnCallback([$this, 'scopeConfigGetValue']);
 
         $xmlElFactory = $this->getXmlFactory();
         $rateFactory = $this->getRateFactory();
@@ -250,6 +249,9 @@ protected function _invokePrepareShippingLabelContent(\SimpleXMLElement $xml)
 
     public function testCollectRates()
     {
+        $this->scope->method('getValue')
+            ->willReturnCallback([$this, 'scopeConfigGetValue']);
+
         $this->scope->method('isSetFlag')
             ->willReturn(true);
 
@@ -279,6 +281,9 @@ public function testCollectRates()
 
     public function testCollectRatesErrorMessage()
     {
+        $this->scope->method('getValue')
+            ->willReturnCallback([$this, 'scopeConfigGetValue']);
+
         $this->scope->expects($this->once())->method('isSetFlag')->willReturn(false);
 
         $this->error->expects($this->once())->method('setCarrier')->with('dhl');
@@ -306,6 +311,9 @@ public function testCollectRatesFail()
      */
     public function testRequestToShipment()
     {
+        $this->scope->method('getValue')
+            ->willReturnCallback([$this, 'scopeConfigGetValue']);
+
         $this->httpResponse->method('getBody')
             ->willReturn(utf8_encode(file_get_contents(__DIR__ . '/_files/response_shipping_label.xml')));
 
@@ -326,7 +334,7 @@ public function testRequestToShipment()
                         'name' => 'item_name',
                     ],
                 ],
-            ]
+            ],
         ];
 
         $order = $this->getMockBuilder(Order::class)
@@ -393,6 +401,78 @@ public function requestToShipmentDataProvider()
             ]
         ];
     }
+
+    /**
+     * Test that shipping label request for origin country from AP region doesn't contain restricted fields.
+     *
+     * @return void
+     */
+    public function testShippingLabelRequestForAsiaPacificRegion()
+    {
+        $this->scope->method('getValue')
+            ->willReturnMap(
+                [
+                    ['shipping/origin/country_id', ScopeInterface::SCOPE_STORE, null, 'SG'],
+                    ['carriers/dhl/gateway_url', ScopeInterface::SCOPE_STORE, null, 'https://xmlpi-ea.dhl.com'],
+                ]
+            );
+
+        $this->httpResponse->method('getBody')
+            ->willReturn(utf8_encode(file_get_contents(__DIR__ . '/_files/response_shipping_label.xml')));
+
+        $packages = [
+            'package' => [
+                'params' => [
+                    'width' => '1',
+                    'length' => '1',
+                    'height' => '1',
+                    'dimension_units' => 'INCH',
+                    'weight_units' => 'POUND',
+                    'weight' => '0.45',
+                    'customs_value' => '10.00',
+                    'container' => Carrier::DHL_CONTENT_TYPE_NON_DOC,
+                ],
+                'items' => [
+                    'item1' => [
+                        'name' => 'item_name',
+                    ],
+                ],
+            ],
+        ];
+
+        $this->request->method('getPackages')->willReturn($packages);
+        $this->request->method('getOrigCountryId')->willReturn('SG');
+        $this->request->method('setPackages')->willReturnSelf();
+        $this->request->method('setPackageWeight')->willReturnSelf();
+        $this->request->method('setPackageValue')->willReturnSelf();
+        $this->request->method('setValueWithDiscount')->willReturnSelf();
+        $this->request->method('setPackageCustomsValue')->willReturnSelf();
+
+        $result = $this->model->requestToShipment($this->request);
+
+        $reflectionClass = new \ReflectionObject($this->httpClient);
+        $rawPostData = $reflectionClass->getProperty('raw_post_data');
+        $rawPostData->setAccessible(true);
+
+        $this->assertNotNull($result);
+        $requestXml = $rawPostData->getValue($this->httpClient);
+
+        $this->assertNotContains(
+            'NewShipper',
+            $requestXml,
+            'NewShipper is restricted field for AP region'
+        );
+        $this->assertNotContains(
+            'Division',
+            $requestXml,
+            'Division is restricted field for AP region'
+        );
+        $this->assertNotContains(
+            'RegisteredAccount',
+            $requestXml,
+            'RegisteredAccount is restricted field for AP region'
+        );
+    }
 
     /**
      * @dataProvider dhlProductsDataProvider