MAGETWO-51479: Product Page. Advanced Inventory. Manage Stock Control Works Wrong.

Bohdan Korablov · Bohdan Korablov · commit 1be01f4498d9 · 2016-04-06T18:07:05.000+03:00
diff --git a/app/code/Magento/CatalogInventory/Model/Source/StockConfiguration.php b/app/code/Magento/CatalogInventory/Model/Source/StockConfiguration.php
@@ -31,6 +31,7 @@ public function __construct(StockConfigurationInterface $stockConfiguration)
      */
     public function getValue($name)
     {
-        return $this->stockConfiguration->getDefaultConfigValue($name);
+        $value= $this->stockConfiguration->getDefaultConfigValue($name);
+        return is_numeric($value) ? (float)$value : $value;
     }
 }
diff --git a/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml b/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml
@@ -51,6 +51,7 @@
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
                             <item name="formElement" xsi:type="string">select</item>
+                            <item name="rawOptions" xsi:type="boolean">true</item>
                             <item name="dataScope" xsi:type="string">manage_stock</item>
                             <item name="value" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>
                         </item>
@@ -288,6 +289,7 @@
                             <item name="component" xsi:type="string">Magento_CatalogInventory/js/components/backorders</item>
                             <item name="deferredStockUpdate" xsi:type="string">ns = ${ $.ns }, index=container_deferred_stock_update</item>
                             <item name="formElement" xsi:type="string">select</item>
+                            <item name="rawOptions" xsi:type="boolean">true</item>
                             <item name="dataScope" xsi:type="string">backorders</item>
                             <item name="value" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>
                         </item>
@@ -328,6 +330,7 @@
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
                             <item name="formElement" xsi:type="string">select</item>
+                            <item name="rawOptions" xsi:type="boolean">true</item>
                             <item name="dataScope" xsi:type="string">deferred_stock_update</item>
                             <item name="value" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>
                         </item>
@@ -413,6 +416,7 @@
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
                             <item name="formElement" xsi:type="string">select</item>
+                            <item name="rawOptions" xsi:type="boolean">true</item>
                             <item name="dataScope" xsi:type="string">enable_qty_increments</item>
                             <item name="value" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>
                         </item>
diff --git a/app/code/Magento/Ui/Component/Form/Element/AbstractOptionsField.php b/app/code/Magento/Ui/Component/Form/Element/AbstractOptionsField.php
@@ -53,7 +53,9 @@ public function prepare()
             } else {
                 $options = array_values($this->options);
             }
-            $options = $this->convertOptionsValueToString($options);
+            if (!isset($config['rawOptions']) || $config['rawOptions'] === false) {
+                $options = $this->convertOptionsValueToString($options);
+            }
             $config['options'] = array_values(array_merge_recursive($options, $config['options']));
         }
         $this->setData('config', (array)$config);

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public function __construct(StockConfigurationInterface $stockConfiguration)`
`31`	`31`	`*/`
`32`	`32`	`public function getValue($name)`
`33`	`33`	`{`
`34`		`- return $this->stockConfiguration->getDefaultConfigValue($name);`
	`34`	`+ $value= $this->stockConfiguration->getDefaultConfigValue($name);`
	`35`	`+ return is_numeric($value) ? (float)$value : $value;`
`35`	`36`	`}`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,9 @@ public function prepare()`
`53`	`53`	`} else {`
`54`	`54`	`$options = array_values($this->options);`
`55`	`55`	`}`
`56`		`- $options = $this->convertOptionsValueToString($options);`
	`56`	`+ if (!isset($config['rawOptions']) \|\| $config['rawOptions'] === false) {`
	`57`	`+ $options = $this->convertOptionsValueToString($options);`
	`58`	`+ }`
`57`	`59`	`$config['options'] = array_values(array_merge_recursive($options, $config['options']));`
`58`	`60`	`}`
`59`	`61`	`$this->setData('config', (array)$config);`