MC-41911: Decimal quantity is converted to integer value when updated

Author: tsviklinskyi

app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php

@@ -5,9 +5,11 @@
  */
 namespace Magento\Checkout\Controller\Sidebar;
 
+use Magento\Checkout\Model\Cart\RequestQuantityProcessor;
 use Magento\Checkout\Model\Sidebar;
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Response\Http;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Json\Helper\Data;
@@ -30,23 +32,32 @@ class UpdateItemQty extends Action
      */
     protected $jsonHelper;
 
+    /**
+     * @var RequestQuantityProcessor
+     */
+    private $quantityProcessor;
+
     /**
      * @param Context $context
      * @param Sidebar $sidebar
      * @param LoggerInterface $logger
      * @param Data $jsonHelper
+     * @param RequestQuantityProcessor|null $quantityProcessor
      * @codeCoverageIgnore
      */
     public function __construct(
         Context $context,
         Sidebar $sidebar,
         LoggerInterface $logger,
-        Data $jsonHelper
+        Data $jsonHelper,
+        ?RequestQuantityProcessor $quantityProcessor = null
     ) {
         $this->sidebar = $sidebar;
         $this->logger = $logger;
         $this->jsonHelper = $jsonHelper;
         parent::__construct($context);
+        $this->quantityProcessor = $quantityProcessor
+            ?? ObjectManager::getInstance()->get(RequestQuantityProcessor::class);
     }
 
     /**
@@ -56,6 +67,7 @@ public function execute()
     {
         $itemId = (int)$this->getRequest()->getParam('item_id');
         $itemQty = $this->getRequest()->getParam('item_qty') * 1;
+        $itemQty = $this->quantityProcessor->prepareQuantity($itemQty);
 
         try {
             $this->sidebar->checkQuoteItem($itemId);

app/code/Magento/Checkout/Model/Cart/RequestQuantityProcessor.php

@@ -8,6 +8,7 @@
 namespace Magento\Checkout\Model\Cart;
 
 use Magento\Framework\Locale\ResolverInterface;
+use Zend_Locale_Data;
 
 /**
  * Cart request quantity processor
@@ -41,11 +42,38 @@ public function process(array $cartData): array
 
         foreach ($cartData as $index => $data) {
             if (isset($data['qty'])) {
+                $data['qty'] = $this->prepareQuantity($data['qty']);
                 $data['qty'] = is_string($data['qty']) ? trim($data['qty']) : $data['qty'];
                 $cartData[$index]['qty'] = $filter->filter($data['qty']);
             }
         }
 
         return $cartData;
     }
+
+    /**
+     * Prepare quantity with taking into account decimal separator by locale
+     *
+     * @param int|float|string|array $quantity
+     * @return int|float|string|array
+     * @throws \Zend_Locale_Exception
+     */
+    public function prepareQuantity($quantity)
+    {
+        $symbols = Zend_Locale_Data::getList($this->localeResolver->getLocale(),'symbols');
+
+        if (is_array($quantity)) {
+            foreach ($quantity as $key => $qty) {
+                if (strpos((string)$qty, '.') !== false && $symbols['decimal'] !== '.') {
+                    $quantity[$key] = str_replace('.', $symbols['decimal'], $qty);
+                }
+            }
+        } else {
+            if (strpos((string)$quantity, '.') !== false && $symbols['decimal'] !== '.') {
+                $quantity = str_replace('.', $symbols['decimal'], (string)$quantity);
+            }
+        }
+
+        return $quantity;
+    }
 }

app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/UpdateItemQtyTest.php

@@ -8,6 +8,7 @@
 namespace Magento\Checkout\Test\Unit\Controller\Sidebar;
 
 use Magento\Checkout\Controller\Sidebar\UpdateItemQty;
+use Magento\Checkout\Model\Cart\RequestQuantityProcessor;
 use Magento\Checkout\Model\Sidebar;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
@@ -41,11 +42,15 @@ class UpdateItemQtyTest extends TestCase
     /** @var ResponseInterface|MockObject */
     protected $responseMock;
 
+    /** @var RequestQuantityProcessor|MockObject */
+    private $quantityProcessor;
+
     protected function setUp(): void
     {
         $this->sidebarMock = $this->createMock(Sidebar::class);
         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
         $this->jsonHelperMock = $this->createMock(Data::class);
+        $this->quantityProcessor = $this->createMock(RequestQuantityProcessor::class);
         $this->requestMock = $this->getMockForAbstractClass(RequestInterface::class);
         $this->responseMock = $this->getMockForAbstractClass(
             ResponseInterface::class,
@@ -64,6 +69,7 @@ protected function setUp(): void
                 'sidebar' => $this->sidebarMock,
                 'logger' => $this->loggerMock,
                 'jsonHelper' => $this->jsonHelperMock,
+                'quantityProcessor' => $this->quantityProcessor,
                 'request' => $this->requestMock,
                 'response' => $this->responseMock,
             ]
@@ -115,6 +121,11 @@ public function testExecute()
             )
             ->willReturn('json encoded');
 
+        $this->quantityProcessor->expects($this->once())
+            ->method('prepareQuantity')
+            ->with(2)
+            ->willReturn(2);
+
         $this->responseMock->expects($this->once())
             ->method('representJson')
             ->with('json encoded')

app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php

@@ -28,24 +28,24 @@ protected function setUp(): void
     {
         $this->localeResolver = $this->getMockBuilder(ResolverInterface::class)
             ->getMockForAbstractClass();
-
-        $this->localeResolver->method('getLocale')
-            ->willReturn('en_US');
-
-        $this->requestProcessor = new RequestQuantityProcessor(
-            $this->localeResolver
-        );
     }
 
     /**
      * Test of cart data processing.
      *
      * @param array $cartData
+     * @param string $locale
      * @param array $expected
      * @dataProvider cartDataProvider
      */
-    public function testProcess($cartData, $expected)
+    public function testProcess(array $cartData, string $locale, array $expected): void
     {
+        $this->localeResolver->method('getLocale')
+            ->willReturn($locale);
+        $this->requestProcessor = new RequestQuantityProcessor(
+            $this->localeResolver
+        );
+
         $this->assertEquals($this->requestProcessor->process($cartData), $expected);
     }
 
@@ -57,13 +57,15 @@ public function cartDataProvider()
         return [
             'empty_array' => [
                 'cartData' => [],
+                'locale' => 'en_US',
                 'expected' => [],
             ],
             'strings_array' => [
                 'cartData' => [
                     ['qty' => ' 10 '],
                     ['qty' => ' 0.5 ']
                 ],
+                'locale' => 'en_US',
                 'expected' => [
                     ['qty' => 10],
                     ['qty' => 0.5]
@@ -74,6 +76,7 @@ public function cartDataProvider()
                     ['qty' => 1],
                     ['qty' => 0.002]
                 ],
+                'locale' => 'en_US',
                 'expected' => [
                     ['qty' => 1],
                     ['qty' => 0.002]
@@ -83,10 +86,22 @@ public function cartDataProvider()
                 'cartData' => [
                     ['qty' => [1, 2 ,3]],
                 ],
+                'locale' => 'en_US',
                 'expected' => [
                     ['qty' => [1, 2, 3]],
                 ],
             ],
+            'strings_array_spain_locale' => [
+                'cartData' => [
+                    ['qty' => ' 10 '],
+                    ['qty' => ' 0.5 ']
+                ],
+                'locale' => 'es_CL',
+                'expected' => [
+                    ['qty' => 10],
+                    ['qty' => 0.5]
+                ],
+            ],
         ];
     }
 }