MAGETWO-58568: [SalesOrder] HTML tags displayed on the price field.

 - use PriceCurrency to format and convert in renderer

Author: Robert He

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php

@@ -46,9 +46,9 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
     protected $_localeCurrency;
 
     /**
-     * @var \Magento\Framework\Intl\NumberFormatterFactory
+     * @var \Magento\Framework\Pricing\PriceCurrencyInterface
      */
-    private $numberFormatterFactory;
+    private $priceCurrency;
 
     /**
      * @param \Magento\Backend\Block\Context $context
@@ -78,20 +78,20 @@ public function __construct(
     }
 
     /**
-     * Get number formatter factory
+     * Get price currency
      *
-     * @return \Magento\Framework\Intl\NumberFormatterFactory
+     * @return \Magento\Framework\Pricing\PriceCurrencyInterface
      *
      * @deprecated
      */
-    private function getNumberFormatterFactory()
+    private function getPriceCurrency()
     {
-        if ($this->numberFormatterFactory === null) {
-            $this->numberFormatterFactory = \Magento\Framework\App\ObjectManager::getInstance()->get(
-                \Magento\Framework\Intl\NumberFormatterFactory::class
+        if ($this->priceCurrency === null) {
+            $this->priceCurrency = \Magento\Framework\App\ObjectManager::getInstance()->get(
+                \Magento\Framework\Pricing\PriceCurrencyInterface::class
             );
         }
-        return $this->numberFormatterFactory;
+        return $this->priceCurrency;
     }
 
     /**
@@ -102,25 +102,9 @@ private function getNumberFormatterFactory()
      */
     public function render(\Magento\Framework\DataObject $row)
     {
-        if ($data = (string)$this->_getValue($row)) {
-            $currency_code = $this->_getCurrencyCode($row);
-            $currency = $this->_localeCurrency->getCurrency($currency_code);
-            $numberFormatter = $this->getNumberFormatterFactory()
-                ->create($currency->getLocale(), \NumberFormatter::CURRENCY);
-            // Optionally need to strip tags from the column field
-            if (!$stripData = $this->stripTags($data)) {
-                $stripData = $data;
-            }
-            // Optionally need to remove currency symbols
-            if (!$price = $numberFormatter->parseCurrency($stripData, $currency_code)) {
-                $price = $stripData;
-            }
-            $convertedPrice = $price * $this->_getRate($row);
-            $sign = (bool)(int)$this->getColumn()->getShowNumberSign() && $data > 0 ? '+' : '';
-            $data = $currency->toCurrency($convertedPrice);
-            return $sign . $data;
-        }
-        return $this->getColumn()->getDefault();
+        $price = $this->_getValue($row) ? $this->_getValue($row) : $this->getColumn()->getDefault();
+        $displayPrice = $this->getPriceCurrency()->convertAndFormat($price, false);
+        return $displayPrice;
     }
 
     /**

app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/CurrencyTest.php

@@ -50,7 +50,7 @@ class CurrencyTest extends \PHPUnit_Framework_TestCase
     /*
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $numberFactoryMock;
+    protected $priceCurrencyMock;
 
     protected function setUp()
     {
@@ -101,17 +101,19 @@ protected function setUp()
 
         $this->_blockCurrency->setColumn($this->_columnMock);
 
-        $this->numberFormatterFactoryMock = $this->getMock(
-            \Magento\Framework\Intl::class,
-            ['create'],
+        $this->priceCurrencyMock = $this->getMockForAbstractClass(
+            \Magento\Framework\Pricing\PriceCurrencyInterface::class,
             [],
             '',
-            false
+            false,
+            true,
+            true,
+            ['convertAndFormat']
         );
         $helper->setBackwardCompatibleProperty(
             $this->_blockCurrency,
-            'numberFormatterFactory',
-            $this->numberFormatterFactoryMock
+            'priceCurrency',
+            $this->priceCurrencyMock
         );
     }
 
@@ -131,40 +133,11 @@ protected function tearDown()
      */
     public function testRenderWithDefaultCurrency()
     {
-        $this->_currencyMock->expects($this->once())
-            ->method('getRate')
-            ->with('USD')
-            ->willReturn(1.5);
-        $currLocaleMock = $this->getMock(\Magento\Framework\Currency::class, ['getLocale','toCurrency'], [], '', false);
-        $currLocaleMock->expects($this->once())
-            ->method('getLocale')
-            ->willReturn('en_US');
-        $this->_localeMock->expects($this->once())
-            ->method('getCurrency')
-            ->with('USD')
-            ->will($this->returnValue($currLocaleMock));
-
-        $numberFormatterMock = $this->getMock(\NumberFormatter::class, ['parseCurrency'], [], '', false);
-        $this->numberFormatterFactoryMock->expects($this->once())
-            ->method('create')
-            ->with('en_US', \NumberFormatter::CURRENCY)
-            ->will($this->returnValue($numberFormatterMock));
-
-        $numberFormatterMock->expects($this->once())
-            ->method('parseCurrency')
-            ->with('$10.00', 'USD')
-            ->willReturn(10);
-
-        $this->_curLocatorMock->expects($this->any())
-            ->method('getDefaultCurrency')
-            ->with($this->_requestMock)
-            ->willReturn('USD');
-
-        $currLocaleMock->expects($this->once())
-            ->method('toCurrency')
-            ->with(15.0000)
-            ->willReturn('$15.00');
-
-        $this->assertEquals('$15.00', $this->_blockCurrency->render($this->_row));
+        $this->priceCurrencyMock->expects($this->once())
+            ->method('convertAndFormat')
+            ->with('$10.00', false)
+            ->willReturn('$10.00');
+
+        $this->assertEquals('$10.00', $this->_blockCurrency->render($this->_row));
     }
 }