MAGETWO-82132: Comma special character in cart price rule condition value results in incorrect rule

Author: Sergey Shvets

app/code/Magento/Rule/Model/Condition/AbstractCondition.php

@@ -380,7 +380,7 @@ public function isArrayOperatorType()
     }
 
     /**
-     * @return array
+     * @return mixed
      */
     public function getValue()
     {

app/code/Magento/SalesRule/Model/Rule/Condition/Product.php

@@ -59,7 +59,7 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
         if ($attrCode === 'quote_item_price') {
             $numericOperations = $this->getDefaultOperatorInputByType()['numeric'];
             if (in_array($this->getOperator(), $numericOperations)) {
-                $this->setData('value', $this->_localeFormat->getNumber($this->getValue()));
+                $this->setData('value', $this->getFormattedPrice($this->getValue()));
             }
         }
 
@@ -87,4 +87,23 @@ public function getValueElementChooserUrl()
         }
         return $url !== false ? $this->_backendData->getUrl($url) : '';
     }
+
+    /**
+     * @param string $value
+     * @return float|null
+     */
+    private function getFormattedPrice($value)
+    {
+        $value = preg_replace('/[^0-9^\^.,-]/m', '', $value);
+
+        /**
+         * If the comma is the third symbol in the number, we consider it to be a decimal separator
+         */
+        $separatorComa = strpos($value, ',');
+        $separatorDot = strpos($value, '.');
+        if ($separatorComa !== false && $separatorDot === false && preg_match('/,\d{3}$/m', $value) === 1) {
+            $value .= '.00';
+        }
+        return $this->_localeFormat->getNumber($value);
+    }
 }

lib/internal/Magento/Framework/Locale/Format.php

@@ -65,7 +65,7 @@ public function getNumber($value)
         }
 
         //trim spaces and apostrophes
-        $value = str_replace(['\'', ' '], '', $value);
+        $value = preg_replace('/[^0-9^\^.,-]/m', '', $value);
 
         $separatorComa = strpos($value, ',');
         $separatorDot = strpos($value, '.');

lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php

@@ -41,9 +41,7 @@ protected function setUp()
         $this->scope = $this->getMockBuilder(\Magento\Framework\App\ScopeInterface::class)
             ->setMethods(['getCurrentCurrency'])
             ->getMockForAbstractClass();
-        $this->scope->expects($this->once())
-            ->method('getCurrentCurrency')
-            ->willReturn($this->currency);
+
         $this->scopeResolver = $this->getMockBuilder(\Magento\Framework\App\ScopeResolverInterface::class)
             ->setMethods(['getScope'])
             ->getMockForAbstractClass();
@@ -52,6 +50,8 @@ protected function setUp()
             ->willReturn($this->scope);
         $this->localeResolver = $this->getMockBuilder(\Magento\Framework\Locale\ResolverInterface::class)
             ->getMock();
+
+        /** @var \Magento\Directory\Model\CurrencyFactory|\PHPUnit_Framework_MockObject_MockObject $currencyFactory */
         $currencyFactory = $this->getMockBuilder(\Magento\Directory\Model\CurrencyFactory::class)
             ->getMock();
 
@@ -69,6 +69,10 @@ protected function setUp()
      */
     public function testGetPriceFormat($localeCode, $expectedResult)
     {
+        $this->scope->expects($this->once())
+            ->method('getCurrentCurrency')
+            ->willReturn($this->currency);
+
         $result = $this->formatModel->getPriceFormat($localeCode);
         $intersection = array_intersect_assoc($result, $expectedResult);
         $this->assertCount(count($expectedResult), $intersection);
@@ -86,4 +90,35 @@ public function getPriceFormatDataProvider()
             ['uk_UA', ['decimalSymbol' => ',', 'groupSymbol' => ' ']]
         ];
     }
+
+
+    /**
+     * @param float | null $expected
+     * @param string|float|int $value
+     * @dataProvider provideNumbers
+     */
+    public function testGetNumber($value, $expected)
+    {
+        $this->assertEquals($expected, $this->formatModel->getNumber($value));
+    }
+
+
+    /**
+     * @return array
+     */
+    public function provideNumbers(): array
+    {
+        return [
+            ['  2345.4356,1234', 23454356.1234],
+            ['+23,3452.123', 233452.123],
+            ['12343', 12343],
+            ['-9456km', -9456],
+            ['0', 0],
+            ['2 054,10', 2054.1],
+            ['2046,45', 2046.45],
+            ['2 054.52', 2054.52],
+            ['2,46 GB', 2.46],
+            ['2,054.00', 2054],
+        ];
+    }
 }