Fix #7333 Unable to set negative custom option fixed price in admin view.

Author: dverkade

app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php

@@ -132,11 +132,11 @@ protected function validateOptionType(Option $option)
      */
     protected function validateOptionValue(Option $option)
     {
-        return $this->isInRange($option->getPriceType(), $this->priceTypes) && !$this->isNegative($option->getPrice());
+        return $this->isInRange($option->getPriceType(), $this->priceTypes) && $this->isNumber($option->getPrice());
     }
 
     /**
-     * Check whether value is empty
+     * Check whether the value is empty
      *
      * @param mixed $value
      * @return bool
@@ -147,7 +147,7 @@ protected function isEmpty($value)
     }
 
     /**
-     * Check whether value is in range
+     * Check whether the value is in range
      *
      * @param string $value
      * @param array $range
@@ -159,7 +159,7 @@ protected function isInRange($value, array $range)
     }
 
     /**
-     * Check whether value is not negative
+     * Check whether the value is negative
      *
      * @param string $value
      * @return bool
@@ -168,4 +168,15 @@ protected function isNegative($value)
     {
         return intval($value) < 0;
     }
+
+    /**
+     * Check whether the value is a number
+     *
+     * @param string $value
+     * @return bool
+     */
+    protected function isNumber($value)
+    {
+        return is_numeric($value);
+    }
 }

app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php

@@ -83,7 +83,7 @@ protected function isValidOptionPrice($priceType, $price, $storeId)
         if (!$priceType && !$price) {
             return true;
         }
-        if (!$this->isInRange($priceType, $this->priceTypes) || $this->isNegative($price)) {
+        if (!$this->isInRange($priceType, $this->priceTypes) || !$this->isNumber($price)) {
             return false;
         }
 

app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php

@@ -129,11 +129,13 @@ public function testIsValidFail($product)
      * Data provider for testValidationNegativePrice
      * @return array
      */
-    public function validationNegativePriceDataProvider()
+    public function validationPriceDataProvider()
     {
         return [
             ['option_title', 'name 1.1', 'fixed', -12, new \Magento\Framework\DataObject(['store_id' => 1])],
             ['option_title', 'name 1.1', 'fixed', -12, new \Magento\Framework\DataObject(['store_id' => 0])],
+            ['option_title', 'name 1.1', 'fixed', 12, new \Magento\Framework\DataObject(['store_id' => 1])],
+            ['option_title', 'name 1.1', 'fixed', 12, new \Magento\Framework\DataObject(['store_id' => 0])]
         ];
     }
 
@@ -143,9 +145,9 @@ public function validationNegativePriceDataProvider()
      * @param $priceType
      * @param $price
      * @param $product
-     * @dataProvider validationNegativePriceDataProvider
+     * @dataProvider validationPriceDataProvider
      */
-    public function testValidationNegativePrice($title, $type, $priceType, $price, $product)
+    public function testValidationPrice($title, $type, $priceType, $price, $product)
     {
         $methods = ['getTitle', 'getType', 'getPriceType', 'getPrice', '__wakeup', 'getProduct'];
         $valueMock = $this->createPartialMock(\Magento\Catalog\Model\Product\Option::class, $methods);
@@ -155,10 +157,8 @@ public function testValidationNegativePrice($title, $type, $priceType, $price, $
         $valueMock->expects($this->once())->method('getPrice')->will($this->returnValue($price));
         $valueMock->expects($this->once())->method('getProduct')->will($this->returnValue($product));
 
-        $messages = [
-            'option values' => 'Invalid option value',
-        ];
-        $this->assertFalse($this->validator->isValid($valueMock));
+        $messages = [];
+        $this->assertTrue($this->validator->isValid($valueMock));
         $this->assertEquals($messages, $this->validator->getMessages());
     }
 }

app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php

@@ -87,7 +87,7 @@ public function isValidSuccessDataProvider()
                 ]
             ],
             [
-                false,
+                true,
                 [
                     'title' => 'Some Title',
                     'price_type' => 'fixed',
@@ -157,7 +157,6 @@ public function testIsValidateWithInvalidData($priceType, $price, $title)
     public function isValidateWithInvalidDataDataProvider()
     {
         return [
-            'invalid_price' => ['fixed', -10, 'Title'],
             'invalid_price_type' => ['some_value', '10', 'Title'],
             'empty_title' => ['fixed', 10, null]
         ];

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php

@@ -923,7 +923,7 @@ protected function getPriceFieldConfig($sortOrder)
                         'addbeforePool' => $this->productOptionsPrice->prefixesToOptionArray(),
                         'sortOrder' => $sortOrder,
                         'validation' => [
-                            'validate-zero-or-greater' => true
+                            'validate-number' => true
                         ],
                     ],
                 ],