MAGETWO-69260: Unable to create shipping label due to error of lb to kg conversion

YevSent · YevSent · commit f295aa03809b · 2017-06-22T14:28:02.000+03:00
- Replace the `round` method by `sprintf`
diff --git a/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php b/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php
@@ -71,14 +71,12 @@ public function _construct()
             )
         );
 
-        $weight = round(
-            $this->carrierHelper->convertMeasureWeight(
-                $kgWeight,
-                \Zend_Measure_Weight::KILOGRAM,
-                \Zend_Measure_Weight::POUND
-            ),
-            3
+        $convertedWeight = $this->carrierHelper->convertMeasureWeight(
+            $kgWeight,
+            \Zend_Measure_Weight::KILOGRAM,
+            \Zend_Measure_Weight::POUND
         );
+        $weight = sprintf('%.3f', $convertedWeight);
 
         $this->setDivideOrderWeightNoteLbp(
             __(
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
@@ -422,7 +422,7 @@ public function setRequest(\Magento\Framework\DataObject $request)
 
         $shippingWeight = $request->getPackageWeight();
 
-        $requestObject->setValue(round($request->getPackageValue(), 2))
+        $requestObject->setValue(sprintf('%.2f', $request->getPackageValue()))
             ->setValueWithDiscount($request->getPackageValueWithDiscount())
             ->setCustomsValue($request->getPackageCustomsValue())
             ->setDestStreet($this->string->substr(str_replace("\n", '', $request->getDestStreet()), 0, 35))
@@ -670,13 +670,13 @@ protected function _getWeight($weight, $maxWeight = false, $configWeightUnit = f
 
         if ($configWeightUnit != $countryWeightUnit) {
             $weight = $this->_carrierHelper->convertMeasureWeight(
-                round($weight, 3),
+                sprintf('%.3f', $weight),
                 $configWeightUnit,
                 $countryWeightUnit
             );
         }
 
-        return round($weight, 3);
+        return sprintf('%.3f', $weight);
     }
 
     /**
@@ -806,7 +806,7 @@ protected function _makePieces(\Magento\Shipping\Model\Simplexml\Element $nodeBk
                         $nodePiece = $nodePieces->addChild('Piece', '', '');
                         $nodePiece->addChild('PieceID', $numberOfPieces);
                         $this->_addDimension($nodePiece);
-                        $nodePiece->addChild('Weight', $sumWeight);
+                        $nodePiece->addChild('Weight', sprintf('%.3f', $sumWeight));
                         break;
                     } else {
                         unset($items[$key]);
@@ -815,7 +815,7 @@ protected function _makePieces(\Magento\Shipping\Model\Simplexml\Element $nodeBk
                         $nodePiece = $nodePieces->addChild('Piece', '', '');
                         $nodePiece->addChild('PieceID', $numberOfPieces);
                         $this->_addDimension($nodePiece);
-                        $nodePiece->addChild('Weight', $sumWeight);
+                        $nodePiece->addChild('Weight', sprintf('%.3f', $sumWeight));
                         $sumWeight = 0;
                         break;
                     }
@@ -826,7 +826,7 @@ protected function _makePieces(\Magento\Shipping\Model\Simplexml\Element $nodeBk
                 $nodePiece = $nodePieces->addChild('Piece', '', '');
                 $nodePiece->addChild('PieceID', $numberOfPieces);
                 $this->_addDimension($nodePiece);
-                $nodePiece->addChild('Weight', $sumWeight);
+                $nodePiece->addChild('Weight', sprintf('%.3f', $sumWeight));
             }
         } else {
             $nodePiece = $nodePieces->addChild('Piece', '', '');
@@ -870,13 +870,13 @@ protected function _getDimension($dimension, $configWeightUnit = false)
 
         if ($configDimensionUnit != $countryDimensionUnit) {
             $dimension = $this->_carrierHelper->convertMeasureDimension(
-                round($dimension, 3),
+                sprintf('%.3f', $dimension),
                 $configDimensionUnit,
                 $countryDimensionUnit
             );
         }
 
-        return round($dimension, 3);
+        return sprintf('%.3f', $dimension);
     }
 
     /**
@@ -1614,7 +1614,7 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
             }
             $nodePiece->addChild('PieceID', ++$i);
             $nodePiece->addChild('PackageType', $packageType);
-            $nodePiece->addChild('Weight', round($package['params']['weight'], 1));
+            $nodePiece->addChild('Weight', sprintf('%.1f', $package['params']['weight']));
             $params = $package['params'];
             if ($params['width'] && $params['length'] && $params['height']) {
                 if (!$originRegion) {
@@ -1635,7 +1635,7 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
         }
 
         if (!$originRegion) {
-            $nodeShipmentDetails->addChild('Weight', round($rawRequest->getPackageWeight(), 1));
+            $nodeShipmentDetails->addChild('Weight', sprintf('%.1f', $rawRequest->getPackageWeight()));
             $nodeShipmentDetails->addChild('WeightUnit', substr($this->_getWeightUnit(), 0, 1));
             $nodeShipmentDetails->addChild('GlobalProductCode', $rawRequest->getShippingMethod());
             $nodeShipmentDetails->addChild('LocalProductCode', $rawRequest->getShippingMethod());
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -5,68 +5,65 @@
  */
 namespace Magento\Dhl\Test\Unit\Model;
 
-use Magento\Quote\Model\Quote\Address\RateRequest;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Framework\HTTP\ZendClientFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Xml\Security;
+use Magento\Quote\Model\Quote\Address\RateRequest;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CarrierTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var ObjectManager
      */
-    protected $_helper;
+    private $objectManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Zend_Http_Response|MockObject
      */
-    protected $_httpResponse;
+    private $httpResponse;
 
     /**
      * @var \Magento\Dhl\Model\Carrier
      */
-    protected $_model;
+    private $model;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Address\RateResult\Error|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Quote\Model\Quote\Address\RateResult\Error|MockObject
      */
-    protected $error;
+    private $error;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory|MockObject
      */
-    protected $errorFactory;
+    private $errorFactory;
 
     /**
-     * @var \Magento\Dhl\Model\Carrier|\PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeConfigInterface|MockObject
      */
-    protected $carrier;
+    private $scope;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ZendClient|MockObject
      */
-    protected $scope;
+    private $httpClient;
 
     /**
      * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     protected function setUp()
     {
-        $this->_helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->objectManager = new ObjectManager($this);
 
-        $this->scope = $this->getMockBuilder(
-            \Magento\Framework\App\Config\ScopeConfigInterface::class
-        )->disableOriginalConstructor()->getMock();
-
-        $this->scope->expects(
-            $this->any()
-        )->method(
-            'getValue'
-        )->will(
-            $this->returnCallback([$this, 'scopeConfiggetValue'])
-        );
+        $this->scope = $this->getMockForAbstractClass(ScopeConfigInterface::class);
+        $this->scope->method('getValue')
+            ->willReturnCallback([$this, 'scopeConfigGetValue']);
 
         // xml element factory
         $xmlElFactory = $this->getMockBuilder(
@@ -77,7 +74,7 @@ protected function setUp()
         $xmlElFactory->expects($this->any())->method('create')->will(
             $this->returnCallback(
                 function ($data) {
-                    $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+                    $helper = new ObjectManager($this);
 
                     return $helper->getObject(
                         \Magento\Shipping\Model\Simplexml\Element::class,
@@ -115,27 +112,23 @@ function ($data) {
 
         $rateMethodFactory->expects($this->any())->method('create')->will($this->returnValue($rateMethod));
 
-        // http client
-        $this->_httpResponse = $this->getMockBuilder(
-            \Zend_Http_Response::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getBody']
-        )->getMock();
+        $this->httpResponse = $this->getMockBuilder(\Zend_Http_Response::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $httpClient = $this->getMockBuilder(
-            \Magento\Framework\HTTP\ZendClient::class
-        )->disableOriginalConstructor()->setMethods(
-            ['request']
-        )->getMock();
-        $httpClient->expects($this->any())->method('request')->will($this->returnValue($this->_httpResponse));
+        $this->httpClient = $this->getMockBuilder(ZendClient::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['request'])
+            ->getMock();
+        $this->httpClient->method('request')
+            ->willReturn($this->httpResponse);
 
-        $httpClientFactory = $this->getMockBuilder(
-            \Magento\Framework\HTTP\ZendClientFactory::class
-        )->disableOriginalConstructor()->setMethods(
-            ['create']
-        )->getMock();
+        $httpClientFactory = $this->getMockBuilder(ZendClientFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $httpClientFactory->method('create')
+            ->willReturn($this->httpClient);
 
-        $httpClientFactory->expects($this->any())->method('create')->will($this->returnValue($httpClient));
         $modulesDirectory = $this->getMockBuilder(
             \Magento\Framework\Filesystem\Directory\Read::class
         )->disableOriginalConstructor()->setMethods(
@@ -174,7 +167,7 @@ function ($data) {
 
         $this->errorFactory->expects($this->any())->method('create')->willReturn($this->error);
 
-        $this->_model = $this->_helper->getObject(
+        $this->model = $this->objectManager->getObject(
             \Magento\Dhl\Model\Carrier::class,
             [
                 'scopeConfig' => $this->scope,
@@ -192,11 +185,12 @@ function ($data) {
     }
 
     /**
-     * Callback function, emulates getValue function
-     * @param $path
-     * @return null|string
+     * Emulates the config's `getValue` method.
+     *
+     * @param string $path
+     * @return string|null
      */
-    public function scopeConfiggetValue($path)
+    public function scopeConfigGetValue($path)
     {
         $pathMap = [
             'carriers/dhl/shipment_days' => 'Mon,Tue,Wed,Thu,Fri,Sat',
@@ -211,6 +205,7 @@ public function scopeConfiggetValue($path)
             'carriers/dhl/showmethod' => 1,
             'carriers/dhl/title' => 'dhl Title',
             'carriers/dhl/specificerrmsg' => 'dhl error message',
+            'carriers/dhl/unit_of_measure' => 'L',
         ];
         return isset($pathMap[$path]) ? $pathMap[$path] : null;
     }
@@ -260,29 +255,32 @@ public function prepareShippingLabelContentExceptionDataProvider()
      */
     protected function _invokePrepareShippingLabelContent(\SimpleXMLElement $xml)
     {
-        $model = $this->_helper->getObject(\Magento\Dhl\Model\Carrier::class);
+        $model = $this->objectManager->getObject(\Magento\Dhl\Model\Carrier::class);
         $method = new \ReflectionMethod($model, '_prepareShippingLabelContent');
         $method->setAccessible(true);
         return $method->invoke($model, $xml);
     }
 
     public function testCollectRates()
     {
-        $this->scope->expects($this->any())->method('isSetFlag')->willReturn(true);
+        $this->scope->method('isSetFlag')
+            ->willReturn(true);
 
-        $this->_httpResponse->expects(
-            $this->any()
-        )->method(
-            'getBody'
-        )->will(
-            $this->returnValue(file_get_contents(__DIR__ . '/_files/success_dhl_response_rates.xml'))
-        );
-        // for setRequest
-        $request = $this->_helper->getObject(
-            \Magento\Quote\Model\Quote\Address\RateRequest::class,
+        $this->httpResponse->method('getBody')
+            ->willReturn(file_get_contents(__DIR__ . '/_files/success_dhl_response_rates.xml'));
+
+        /** @var RateRequest $request */
+        $request = $this->objectManager->getObject(
+            RateRequest::class,
             require __DIR__ . '/_files/rates_request_data_dhl.php'
         );
-        $this->assertNotEmpty($this->_model->collectRates($request)->getAllRates());
+
+        $reflectionClass = new \ReflectionObject($this->httpClient);
+        $rawPostData = $reflectionClass->getProperty('raw_post_data');
+        $rawPostData->setAccessible(true);
+
+        self::assertNotEmpty($this->model->collectRates($request)->getAllRates());
+        self::assertContains('<Weight>8.266</Weight>', $rawPostData->getValue($this->httpClient));
     }
 
     public function testCollectRatesErrorMessage()
@@ -296,7 +294,7 @@ public function testCollectRatesErrorMessage()
         $request = new RateRequest();
         $request->setPackageWeight(1);
 
-        $this->assertSame($this->error, $this->_model->collectRates($request));
+        $this->assertSame($this->error, $this->model->collectRates($request));
     }
 
     public function testCollectRatesFail()
@@ -306,6 +304,6 @@ public function testCollectRatesFail()
         $request = new RateRequest();
         $request->setPackageWeight(1);
 
-        $this->assertFalse(false, $this->_model->collectRates($request));
+        $this->assertFalse(false, $this->model->collectRates($request));
     }
 }
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/rates_request_data_dhl.php b/app/code/Magento/Dhl/Test/Unit/Model/_files/rates_request_data_dhl.php
@@ -14,7 +14,7 @@
         'dest_postal' => '10559',
         'package_value' => '5',
         'package_value_with_discount' => '5',
-        'package_weight' => '5',
+        'package_weight' => '8.2657',
         'package_qty' => '1',
         'package_physical_value' => '5',
         'free_method_weight' => '5',
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
@@ -340,7 +340,8 @@ public function setRequest(\Magento\Quote\Model\Quote\Address\RateRequest $reque
 
         $weight = $this->getTotalNumOfBoxes($request->getPackageWeight());
         $r->setWeightPounds(floor($weight));
-        $r->setWeightOunces(round(($weight - floor($weight)) * self::OUNCES_POUND, self::$weightPrecision));
+        $ounces = ($weight - floor($weight)) * self::OUNCES_POUND;
+        $r->setWeightOunces(sprintf('%.' . self::$weightPrecision . 'f', $ounces));
         if ($request->getFreeMethodWeight() != $request->getPackageWeight()) {
             $r->setFreeMethodWeight($request->getFreeMethodWeight());
         }
@@ -387,7 +388,8 @@ protected function _setFreeMethodRequest($freeMethod)
 
         $weight = $this->getTotalNumOfBoxes($r->getFreeMethodWeight());
         $r->setWeightPounds(floor($weight));
-        $r->setWeightOunces(round(($weight - floor($weight)) * self::OUNCES_POUND, self::$weightPrecision));
+        $ounces = ($weight - floor($weight)) * self::OUNCES_POUND;
+        $r->setWeightOunces(sprintf('%.' . self::$weightPrecision . 'f', $ounces));
         $r->setService($freeMethod);
     }
 
diff --git a/app/code/Magento/Usps/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Usps/Test/Unit/Model/CarrierTest.php
diff --git a/app/code/Magento/Usps/Test/Unit/Model/_files/rates_request_data.php b/app/code/Magento/Usps/Test/Unit/Model/_files/rates_request_data.php
