diff --git a/config/schema/commerce.schema.yml b/config/schema/commerce.schema.yml
index 1c683b069a..c5b757d067 100644
--- a/config/schema/commerce.schema.yml
+++ b/config/schema/commerce.schema.yml
@@ -76,3 +76,29 @@ views.filter.commerce_entity_bundle:
         hide_single_bundle:
           type: boolean
           label: 'Hide if there''s only one bundle.'
+
+field.widget.settings.commerce_number:
+  type: field.widget.settings.number
+  label: 'Number default display format settings'
+  mapping:
+    placeholder:
+      type: label
+      label: 'Placeholder'
+    min:
+      type: string
+      label: 'Minimum'
+    max:
+      type: string
+      label: 'Maximum'
+    default_value:
+      type: string
+      label: 'Default value'
+    step:
+      type: string
+      label: 'Step'
+    prefix:
+      type: string
+      label: 'Prefix'
+    suffix:
+      type: string
+      label: 'Suffix'
diff --git a/modules/cart/src/Plugin/Block/CartBlock.php b/modules/cart/src/Plugin/Block/CartBlock.php
index 49e3f2328e..4dfee4169c 100644
--- a/modules/cart/src/Plugin/Block/CartBlock.php
+++ b/modules/cart/src/Plugin/Block/CartBlock.php
@@ -130,7 +130,7 @@ public function build() {
       $cart_views = $this->getCartViews($carts);
       foreach ($carts as $cart_id => $cart) {
         foreach ($cart->getItems() as $order_item) {
-          $count += (int) $order_item->getQuantity();
+          $count += $order_item->getItemsQuantity();
         }
         $cachable_metadata->addCacheableDependency($cart);
       }
diff --git a/modules/cart/src/Plugin/views/field/EditQuantity.php b/modules/cart/src/Plugin/views/field/EditQuantity.php
index 6bf1b7362c..7090c25467 100644
--- a/modules/cart/src/Plugin/views/field/EditQuantity.php
+++ b/modules/cart/src/Plugin/views/field/EditQuantity.php
@@ -8,6 +8,7 @@
 use Drupal\views\Plugin\views\field\UncacheableFieldHandlerTrait;
 use Drupal\views\ResultRow;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Render\Markup;
 
 /**
  * Defines a form element for editing the order item quantity.
@@ -89,17 +90,25 @@ public function viewsForm(array &$form, FormStateInterface $form_state) {
     $form[$this->options['id']]['#tree'] = TRUE;
     foreach ($this->view->result as $row_index => $row) {
       $order_item = $this->getEntity($row);
-      $quantity = $order_item->getQuantity();
+      $attr = $order_item->getQuantityWidgetSettings();
 
       $form[$this->options['id']][$row_index] = [
         '#type' => 'number',
         '#title' => $this->t('Quantity'),
         '#title_display' => 'invisible',
-        '#default_value' => round($quantity),
+        '#default_value' => $order_item->getQuantity() + 0,
         '#size' => 4,
-        '#min' => 1,
-        '#max' => 9999,
-        '#step' => 1,
+        '#min' => isset($attr['#min']) && is_numeric($attr['#min']) ? $attr['#min'] : '1',
+        '#max' => isset($attr['#max']) && is_numeric($attr['#max']) ? $attr['#max'] : '9999',
+        '#step' => isset($attr['#step']) && is_numeric($attr['#step']) ? $attr['#step'] : '1',
+        '#placeholder' => empty($attr['#placeholder']) ? '' : $attr['#placeholder'],
+        '#field_prefix' => empty($attr['#prefix']) ? '' : Markup::create($attr['#prefix']),
+        '#field_suffix' => empty($attr['#suffix']) ? '' : Markup::create($attr['#suffix']),
+        // Do not allow to change the default quantity if the quantity widget
+        // is hidden on the 'Add to cart' form display.
+        // '#disabled' => $attr['add_to_cart_quantity_hidden'],
+        // Commented out because does not allow to pass the test.
+        // @see modules/cart/tests/src/Functional/CartTest.php.
       ];
     }
     // Replace the form submit button label.
diff --git a/modules/cart/tests/src/Functional/CartBrowserTestBase.php b/modules/cart/tests/src/Functional/CartBrowserTestBase.php
index f417d06451..97d0d12abc 100644
--- a/modules/cart/tests/src/Functional/CartBrowserTestBase.php
+++ b/modules/cart/tests/src/Functional/CartBrowserTestBase.php
@@ -222,9 +222,9 @@ protected function createAttributeValue($attribute, $name) {
    */
   protected function assertOrderItemInOrder(ProductVariationInterface $variation, OrderItemInterface $order_item, $quantity = 1) {
     $this->assertEquals($order_item->getTitle(), $variation->getOrderItemTitle());
-    $this->assertNotEmpty(($order_item->getQuantity() == $quantity), t('The product @product has been added to cart with quantity of @quantity.', [
+    $this->assertNotEmpty(($order_item->getItemsQuantity() == $quantity), t('The product @product has been added to cart with quantity of @quantity.', [
       '@product' => $order_item->getTitle(),
-      '@quantity' => $order_item->getQuantity(),
+      '@quantity' => $order_item->getItemsQuantity(),
     ]));
   }
 
diff --git a/modules/cart/tests/src/Functional/CartTest.php b/modules/cart/tests/src/Functional/CartTest.php
index c72d498d8e..84d96278cc 100644
--- a/modules/cart/tests/src/Functional/CartTest.php
+++ b/modules/cart/tests/src/Functional/CartTest.php
@@ -62,7 +62,8 @@ protected function setUp() {
   public function testCartPage() {
     $this->drupalLogin($this->adminUser);
 
-    $this->cartManager->addEntity($this->cart, $this->variation);
+    $order_item = $this->cartManager->addEntity($this->cart, $this->variation);
+    $quantity = $order_item->getQuantity() + 0;
 
     $this->drupalGet('cart');
     // Confirm the presence of the order total summary.
@@ -70,13 +71,13 @@ public function testCartPage() {
     $this->assertSession()->elementTextContains('css', '.order-total-line', 'Total');
     $this->assertSession()->pageTextContains('$999.00');
     // Confirm the presence and functioning of the Quantity field.
-    $this->assertSession()->fieldValueEquals('edit-edit-quantity-0', 1);
+    $this->assertSession()->fieldValueEquals('edit-edit-quantity-0', $quantity);
     $this->assertSession()->buttonExists('Update cart');
     $values = [
-      'edit_quantity[0]' => 2,
+      'edit_quantity[0]' => $quantity * 2,
     ];
     $this->submitForm($values, t('Update cart'));
-    $this->assertSession()->fieldValueEquals('edit-edit-quantity-0', 2);
+    $this->assertSession()->fieldValueEquals('edit-edit-quantity-0', $quantity * 2);
     $this->assertSession()->elementTextContains('css', '.order-total-line', 'Total');
     $this->assertSession()->pageTextContains('$1,998.00');
 
diff --git a/modules/order/commerce_order.install b/modules/order/commerce_order.install
index 31e4db2e6b..960aba3852 100644
--- a/modules/order/commerce_order.install
+++ b/modules/order/commerce_order.install
@@ -18,3 +18,89 @@ function commerce_order_update_8201() {
   $update_manager = \Drupal::entityDefinitionUpdateManager();
   $update_manager->installFieldStorageDefinition('data', 'commerce_order_item', 'commerce_order', $storage_definition);
 }
+
+/**
+ * Update order item quantity field storage definition.
+ *
+ * @see https://www.drupal.org/node/2794909
+ */
+function commerce_order_update_8301() {
+  $config = \Drupal::configFactory();
+  $key_value = \Drupal::keyValue('entity.definitions.installed');
+  $database = \Drupal::database();
+  $db_schema = $database->schema();
+  $all = $updated = [];
+
+  foreach ($config->listAll('core.entity_form_display.commerce_order_item.') as $id) {
+    $editable = $config->getEditable($id);
+    $data = $editable->getRawData();
+
+    if (isset($data['targetEntityType'])) {
+      $entity_type = $data['targetEntityType'];
+      $field_name = 'quantity';
+      $definitions = $key_value->get("{$entity_type}.field_storage_definitions");
+      if (!isset($definitions[$field_name])) {
+        continue;
+      }
+      $changes = $definitions[$field_name]->getSchema()['columns']['value'];
+      $needs_change = $changes['precision'] != 14 && $changes['scale'] != 4;
+      $changes['precision'] = 14;
+      $changes['scale'] = 4;
+
+      $tables = ["{$entity_type}_revision", $entity_type];
+
+      foreach ($tables as $table) {
+        if ($needs_change && $db_schema->tableExists($table) && !isset($updated[$table])) {
+          $updated[$table] = FALSE;
+
+          // The table data to restore after the update is completed.
+          $all[$table] = $database->select($table, 'n')
+            ->fields('n')
+            ->execute()
+            ->fetchAll();
+
+          // Truncate the field table to unlock it for changes.
+          $database
+            ->truncate($table)
+            ->execute();
+
+          $db_schema->changeField($table, $field_name, $field_name, $changes);
+
+          $updated[$table] = TRUE;
+        }
+      }
+
+      if (isset($data['content'][$field_name]) && $data['content'][$field_name]['type'] !== 'commerce_number') {
+        $data['content'][$field_name]['type'] = 'commerce_number';
+        $data['content'][$field_name]['settings'] += [
+          'min' => '1',
+          'max' => "",
+          'default_value' => '1',
+          'step' =>  '1',
+          'prefix' => '',
+          'suffix' => '',
+        ];
+        $editable->setData($data);
+        $editable->save();
+      }
+    }
+  }
+
+  // Restore earlier saved number fields data.
+  foreach ($all as $table => $rows) {
+    $updated[$table] = FALSE;
+    foreach ($rows as $row) {
+      $database->insert($table)
+        ->fields((array) $row)
+        ->execute();
+    }
+    $updated[$table] = TRUE;
+  }
+
+  if (!empty($updated) && !in_array(FALSE, $updated)) {
+    return t('The order item quantity field definition has been successfully updated.');
+  }
+  else {
+    return t("The attempt to update order item quantity field is failed. To update the field manually go to commerce_order_item table in the site's DB and edit quantity field structure changing its Length to 14,4. Then flush caches and set Commerce number field widget for each of the order item type's enabled form display modes.");
+  }
+}
diff --git a/modules/order/src/Entity/OrderItem.php b/modules/order/src/Entity/OrderItem.php
index 0210f1ae99..3ac372ed18 100644
--- a/modules/order/src/Entity/OrderItem.php
+++ b/modules/order/src/Entity/OrderItem.php
@@ -9,6 +9,8 @@
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Form\FormState;
+use Drupal\Component\Utility\NestedArray;
 
 /**
  * Defines the order item entity class.
@@ -100,6 +102,66 @@ public function getQuantity() {
     return (string) $this->get('quantity')->value;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getItemsQuantity() {
+    $settings = $this->getQuantityWidgetSettings();
+    // The #step value defines the actual type of the current order item's
+    // quantity field. If that is int then we consider the quantity as a sum of
+    // order items. If float, then we consider the quantity as one item
+    // consisting of multiple units. For example: 1 + 2 T-shirts are counted as
+    // 3 separate items but 1.000 + 2.000 kg of butter is counted as 1 item
+    // consisting of 3000 units. Hence, this method must be used only to count
+    // items on an order. The $this->getQuantity() must be used for getting real
+    // quantity disregarding of whatever the type of this number is, for example
+    // to calculate the price of order items.
+    $step = isset($settings['#step']) && is_numeric($settings['#step']) ? $settings['#step'] + 0 : 1;
+    $quantity = $this->getQuantity();
+    return (string) is_int($step) ? $quantity : (is_float($step) && $quantity > 0 ? '1' : $quantity);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuantityWidgetSettings() {
+    $settings = [];
+    // If 'Add to cart' form display mode is enabled we prefer its settings
+    // because exactly those settings are exposed to and used by a customer.
+    $form_display = entity_get_form_display($this->getEntityTypeId(), $this->bundle(), 'add_to_cart');
+    $quantity = $form_display->getComponent('quantity');
+    $settings['add_to_cart_quantity_hidden'] = !$quantity;
+
+    if ($settings['add_to_cart_quantity_hidden']) {
+      $form_display = entity_get_form_display($this->getEntityTypeId(), $this->bundle(), 'default');
+      $quantity = $form_display->getComponent('quantity');
+    }
+
+    if (isset($quantity['settings']['step'])) {
+      $mode_settings = $form_display->getRenderer('quantity')->getFormDisplayModeSettings();
+      foreach ($mode_settings as $key => $value) {
+        $settings["#{$key}"] = $value;
+      }
+    }
+    else {
+      // If $settings has no 'step' it means that some unknown mode is used, so
+      // $form_display->getRenderer('quantity')->getSettings() is useless here.
+      // We use $quantity->defaultValuesForm() to get an array with #min, #max,
+      // #step, #field_prefix, #field_suffix and #default_value elements.
+      $form_state = new FormState();
+      $form = [];
+      $form = $this->get('quantity')->defaultValuesForm($form, $form_state);
+      $settings += (array) NestedArray::getValue($form, ['widget', 0, 'value']);
+      // Make prefix/suffix settings accessible through #prefix/#suffix keys.
+      $settings['#prefix'] = isset($settings['#prefix']) ? $settings['#prefix'] : FALSE;
+      $settings['#suffix'] = isset($settings['#suffix']) ? $settings['#suffix'] : FALSE;
+      $settings['#prefix'] = $settings['#prefix'] ? : (isset($settings['#field_prefix']) ? $settings['#field_prefix'] : '');
+      $settings['#suffix'] = $settings['#suffix'] ? : (isset($settings['#field_suffix']) ? $settings['#field_suffix'] : '');
+    }
+
+    return $settings;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -261,9 +323,15 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setDescription(t('The number of purchased units.'))
       ->setReadOnly(TRUE)
       ->setSetting('unsigned', TRUE)
+      ->setSetting('precision', 14)
+      ->setSetting('scale', 4)
       ->setDefaultValue(1)
       ->setDisplayOptions('form', [
-        'type' => 'number',
+        'type' => 'commerce_number',
+        'weight' => 1,
+      ])
+      ->setDisplayOptions('add_to_cart', [
+        'type' => 'commerce_number',
         'weight' => 1,
       ])
       ->setDisplayConfigurable('form', TRUE)
diff --git a/modules/order/src/Entity/OrderItemInterface.php b/modules/order/src/Entity/OrderItemInterface.php
index af86dbb956..9548366f2b 100644
--- a/modules/order/src/Entity/OrderItemInterface.php
+++ b/modules/order/src/Entity/OrderItemInterface.php
@@ -70,6 +70,22 @@ public function setTitle($title);
    */
   public function getQuantity();
 
+  /**
+   * Gets the order items quantity.
+   *
+   * @return string
+   *   The order items quantity
+   */
+  public function getItemsQuantity();
+
+  /**
+   * Gets the order item quantity field widget settings.
+   *
+   * @return array
+   *   The default form display mode field widget settings
+   */
+  public function getQuantityWidgetSettings();
+
   /**
    * Sets the order item quantity.
    *
diff --git a/modules/order/tests/src/Kernel/Entity/OrderItemTest.php b/modules/order/tests/src/Kernel/Entity/OrderItemTest.php
index c7b012ad63..2f4519df14 100644
--- a/modules/order/tests/src/Kernel/Entity/OrderItemTest.php
+++ b/modules/order/tests/src/Kernel/Entity/OrderItemTest.php
@@ -79,7 +79,7 @@ public function testOrderItem() {
     $this->assertEquals('My order item', $order_item->getTitle());
 
     $this->assertEquals(1, $order_item->getQuantity());
-    $order_item->setQuantity('2');
+    $order_item->setQuantity(2);
     $this->assertEquals(2, $order_item->getQuantity());
 
     $this->assertEquals(NULL, $order_item->getUnitPrice());
diff --git a/modules/product/config/optional/core.entity_form_display.commerce_order_item.default.add_to_cart.yml b/modules/product/config/optional/core.entity_form_display.commerce_order_item.default.add_to_cart.yml
index 78c151ae7d..ad3d6b0645 100644
--- a/modules/product/config/optional/core.entity_form_display.commerce_order_item.default.add_to_cart.yml
+++ b/modules/product/config/optional/core.entity_form_display.commerce_order_item.default.add_to_cart.yml
@@ -9,6 +9,7 @@ dependencies:
       - commerce_cart
       - commerce_product
   module:
+    - commerce
     - commerce_product
 id: commerce_order_item.default.add_to_cart
 targetEntityType: commerce_order_item
@@ -18,7 +19,21 @@ content:
   purchased_entity:
     type: commerce_product_variation_attributes
     weight: 0
-    settings: { }
+    settings: {  }
+    third_party_settings: {  }
+    region: content
+  quantity:
+    type: commerce_number
+    weight: 1
+    region: content
+    settings:
+      placeholder: ''
+      min: '1'
+      max: ''
+      default_value: '1'
+      step: '1'
+      prefix: ''
+      suffix: ''
     third_party_settings: {  }
 hidden:
   created: true
diff --git a/modules/product/config/optional/core.entity_form_display.commerce_order_item.default.default.yml b/modules/product/config/optional/core.entity_form_display.commerce_order_item.default.default.yml
index 63c5c2a994..b6702b1f76 100644
--- a/modules/product/config/optional/core.entity_form_display.commerce_order_item.default.default.yml
+++ b/modules/product/config/optional/core.entity_form_display.commerce_order_item.default.default.yml
@@ -6,6 +6,9 @@ dependencies:
   enforced:
     module:
       - commerce_product
+  module:
+    - commerce
+    - commerce_price
 id: commerce_order_item.default.default
 targetEntityType: commerce_order_item
 bundle: default
@@ -19,17 +22,26 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+    region: content
   quantity:
-    type: number
+    type: commerce_number
     weight: 1
     settings:
       placeholder: ''
+      min: '1'
+      max: ''
+      default_value: '1'
+      step: '1'
+      prefix: ''
+      suffix: ''
     third_party_settings: {  }
+    region: content
   unit_price:
     type: commerce_price_default
     weight: 2
     settings: {  }
     third_party_settings: {  }
+    region: content
 hidden:
   created: true
   status: true
diff --git a/modules/product/config/optional/core.entity_view_display.commerce_order_item.default.default.yml b/modules/product/config/optional/core.entity_view_display.commerce_order_item.default.default.yml
index 3edfecb1b8..78f9a42e66 100644
--- a/modules/product/config/optional/core.entity_view_display.commerce_order_item.default.default.yml
+++ b/modules/product/config/optional/core.entity_view_display.commerce_order_item.default.default.yml
@@ -35,7 +35,7 @@ content:
     settings:
       thousand_separator: ''
       decimal_separator: .
-      scale: 2
+      scale: 4
       prefix_suffix: true
     third_party_settings: {  }
     label: above
diff --git a/src/Plugin/Field/FieldWidget/CommerceNumberWidget.php b/src/Plugin/Field/FieldWidget/CommerceNumberWidget.php
new file mode 100644
index 0000000000..d616099117
--- /dev/null
+++ b/src/Plugin/Field/FieldWidget/CommerceNumberWidget.php
@@ -0,0 +1,253 @@
+<?php
+
+namespace Drupal\commerce\Plugin\Field\FieldWidget;
+
+use Drupal\Core\Field\FieldFilteredMarkup;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Symfony\Component\Validator\ConstraintViolationInterface;
+use Drupal\Core\Field\Plugin\Field\FieldWidget\NumberWidget;
+
+/**
+ * Plugin implementation of the 'commerce_number' widget.
+ *
+ * @FieldWidget(
+ *   id = "commerce_number",
+ *   label = @Translation("Commerce number field"),
+ *   field_types = {
+ *     "integer",
+ *     "decimal",
+ *     "float"
+ *   }
+ * )
+ */
+class CommerceNumberWidget extends NumberWidget {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function defaultSettings() {
+    return array(
+      'placeholder' => '',
+      'min' => '',
+      'max' => '',
+      'default_value' => '',
+      'step' => '',
+      'prefix' => '',
+      'suffix' => '',
+    ) + parent::defaultSettings();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsForm(array $form, FormStateInterface $form_state) {
+    $mode_settings = $this->getSettings();
+    $field_settings = $this->getFieldSettings();
+    $default_value = array_column($this->fieldDefinition->getDefaultValueLiteral(), 'value');
+    $field_settings['placeholder'] = isset($field_settings['placeholder']) ? $field_settings['placeholder'] : '';
+    $field_settings['default_value'] = isset($default_value[0]) ? $default_value[0] : '';
+    $field_settings['step'] = isset($field_settings['step']) ? $field_settings['step'] : '';
+    array_walk($field_settings, function (&$value) {
+      if (empty($value)) {
+        $value = t('None');
+      }
+    });
+    $scale = empty($field_settings['scale']) ? 0 : $field_settings['scale'];
+    $step = '1';
+    $notes = '';
+    $step_description = t('The minimum allowed amount to increment or decrement the field value with.');
+
+    // Set a minimal valid step to set settings for the corresponding field type.
+    switch ($this->fieldDefinition->getType()) {
+      case 'decimal':
+        $step = (string) pow(0.1, $scale);
+        $n = $nn = 'N';
+        $format = ['"' . $n . '"'];
+        while ($field_settings['scale']--) {
+          array_push($format, '"' . $n . '.' . $nn . '"');
+          $nn = "$n$nn";
+        }
+        $notes = t('Restricts the number of digits after decimal sign to the given step format. For this field instance format patterns are the following: @format. Note that omitting the decimal sign in this setting restricts input on the field to integer values despite the actual field type is decimal.', ['@format' => implode(', ', $format)]);
+        break;
+
+      case 'float':
+        $step = 'any';
+        $notes = t('Note that built in step is integer "1" but input on the field could be done in any float or integer format: "N", "N.N", "N.NN", "N.NNN", "N.NNNN", etc..');
+        break;
+    }
+
+    $default_step = !empty($mode_settings['step']) ? $mode_settings['step'] : ($field_settings['step'] == t('None') ? $step : $field_settings['step']);
+
+    $element['placeholder'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Placeholder'),
+      '#default_value' => $mode_settings['placeholder'],
+      '#description' => t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format. Leave blank for default = @default.', ['@default' => $field_settings['placeholder']]),
+      '#placeholder' => $field_settings['placeholder'],
+    );
+    $element['min'] = array(
+      '#type' => 'number',
+      '#title' => t('Minimum'),
+      '#step' => $step,
+      '#default_value' => (string) $mode_settings['min'],
+      '#description' => t('The minimum value that should be allowed in this field. Leave blank for default = @default.', ['@default' => $field_settings['min']]),
+      '#placeholder' => $field_settings['min'],
+    );
+    $element['max'] = array(
+      '#type' => 'number',
+      '#step' => $step,
+      '#title' => t('Maximum'),
+      '#default_value' => (string) $mode_settings['max'],
+      '#description' => t('The maximum value that should be allowed in this field. Leave blank for default = @default.', ['@default' => $field_settings['max']]),
+      '#placeholder' => $field_settings['max'],
+    );
+    $element['default_value'] = array(
+      '#type' => 'number',
+      '#title' => t('Default value'),
+      '#step' => $step,
+      '#default_value' => (string) $mode_settings['default_value'],
+      '#description' => t('The default value for this field. Leave blank for default = @default.', ['@default' => $field_settings['default_value']]),
+      '#placeholder' => $field_settings['default_value'],
+    );
+    $element['step'] = array(
+      '#type' => 'number',
+      '#min' => is_numeric($step) && $step > 0 ? $step : '0',
+      '#step' => $step,
+      '#title' => t('Step'),
+      '#default_value' => $default_step == 'any' ? '1' : (string) $default_step,
+      '#description' => implode(' ', [$step_description, $notes]),
+      '#placeholder' => t('Insert valid step.'),
+      '#required' => TRUE,
+    );
+    $element['prefix'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Prefix'),
+      '#default_value' => $mode_settings['prefix'],
+      '#description' => t('Define a string that should be prefixed to the value, like "$ " or "&euro; ". Leave blank for none. Separate singular and plural values with a pipe ("pound|pounds"). Leave blank for default = @default.', ['@default' => $field_settings['prefix']]),
+      '#placeholder' => $field_settings['prefix'],
+    );
+    $element['suffix'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Suffix'),
+      '#default_value' => $mode_settings['suffix'],
+      '#description' => t('Define a string that should be suffixed to the value, like " m", " kb/s". Separate singular and plural values with a pipe ("pound|pounds"). Leave blank for default = @default.', ['@default' => $field_settings['suffix']]),
+      '#placeholder' => $field_settings['suffix'],
+    );
+
+    // Field base #min setting could be increased and #max decreased only.
+    $min = is_numeric($field_settings['min']) ? $field_settings['min'] : (!empty($field_settings['unsigned']) ? '0' : '');
+    $max = is_numeric($field_settings['max']) ? $field_settings['max'] : '';
+    $min = (string) $min;
+    $max = (string) $max;
+    foreach ($element as $name => $value) {
+      if ($value['#type'] == 'number') {
+        if (is_numeric($min) && $name != 'step') {
+          $element[$name]['#min'] = $min;
+        }
+        if ($num = is_numeric($max)) {
+          $element[$name]['#max'] = $max;
+        }
+      }
+    }
+
+    return $element;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsSummary() {
+    $summary = array();
+    $none = t('None');
+    $settings = $this->getSettings();
+    $form_settings = $this->getFormDisplayModeSettings();
+    foreach ($form_settings as $name => $value) {
+      $value = $settings[$name] == '' && $form_settings[$name] == '' ? $none : $value;
+      $summary[] = "{$name}: {$value}";
+    }
+
+    return $summary;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
+    $value = isset($items[$delta]->value) ? (string) $items[$delta]->value : NULL;
+    $settings = $this->getFormDisplayModeSettings();
+
+    $element += array(
+      '#type' => 'number',
+      '#default_value' => is_numeric($settings['default_value']) ? $settings['default_value'] : $value,
+      '#placeholder' => $settings['placeholder'],
+      '#step' => $settings['step'],
+    );
+
+    // Set minimum and maximum.
+    if (is_numeric($settings['min'])) {
+      $element['#min'] = $settings['min'];
+    }
+    if (is_numeric($settings['max'])) {
+      $element['#max'] = $settings['max'];
+    }
+
+    // Add prefix and suffix.
+    // @todo: consider to not restrict prefix and suffix only to the last
+    // plural value (singular|plural) making it accessible for AJAX/JS handlers.
+    if ($settings['prefix']) {
+      $prefixes = explode('|', $settings['prefix']);
+      $element['#field_prefix'] = FieldFilteredMarkup::create(array_pop($prefixes));
+    }
+    if ($settings['suffix']) {
+      $suffixes = explode('|', $settings['suffix']);
+      $element['#field_suffix'] = FieldFilteredMarkup::create(array_pop($suffixes));
+    }
+
+    return array('value' => $element);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function errorElement(array $element, ConstraintViolationInterface $violation, array $form, FormStateInterface $form_state) {
+    return $element['value'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormDisplayModeSettings() {
+    $field_settings = $this->getFieldSettings();
+    $settings = $this->getSettings();
+    $default_value = array_column($this->fieldDefinition->getDefaultValueLiteral(), 'value');
+    $field_settings['default_value'] = isset($default_value[0]) ? $default_value[0] : '';
+
+    foreach ($settings as $key => $value) {
+      if ($value == '') {
+        $settings[$key] = isset($field_settings[$key]) ? $field_settings[$key] : '';
+      }
+    }
+
+    $settings['min'] = is_numeric($settings['min']) ? $settings['min'] : '';
+    $settings['max'] = is_numeric($settings['max']) ? $settings['max'] : '';
+
+    switch ($this->fieldDefinition->getType()) {
+      case 'integer':
+      case 'float':
+        $settings['step'] = is_numeric($settings['step']) ? $settings['step'] : '1';
+        break;
+
+      case 'decimal':
+        $scale = empty($field_settings['scale']) ? 2 : $field_settings['scale'];
+        $settings['step'] = is_numeric($settings['step']) ? $settings['step'] : pow(0.1, $scale);
+        break;
+
+    }
+    $unsigned = is_numeric($settings['min']) && $settings['min'] >= 0;
+    $settings['min'] = !empty($field_settings['unsigned']) && !$unsigned ? '0' : $settings['min'];
+
+    return $settings;
+  }
+
+}
diff --git a/tests/src/Functional/CommerceNumberWidgetTest.php b/tests/src/Functional/CommerceNumberWidgetTest.php
new file mode 100644
index 0000000000..47772f03db
--- /dev/null
+++ b/tests/src/Functional/CommerceNumberWidgetTest.php
@@ -0,0 +1,792 @@
+<?php
+
+namespace Drupal\Tests\commerce\Functional;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\node\Entity\Node;
+use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests the creation of numeric fields.
+ *
+ * @group field
+ */
+class CommerceNumberWidgetTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('node', 'entity_test', 'field_ui', 'commerce');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->drupalLogin($this->drupalCreateUser(array(
+      'view test entity',
+      'administer entity_test content',
+      'administer content types',
+      'administer node fields',
+      'administer node display',
+      'bypass node access',
+      'administer entity_test fields',
+    )));
+  }
+
+  /**
+   * Test decimal field.
+   */
+  public function testNumberDecimalField() {
+    // Create a field with settings to validate.
+    $field = $this->createNumberField('decimal', ['precision' => 8, 'scale' => 4]);
+    $field_name = $field->getName();
+    // Extract newly saved form display default mode number widget's
+    // $placeholder, $min, $max, $default_value, $step, $prefix and $suffix
+    // settings and test if they are set to field properly. As a helper random
+    // $value for a "user" to insert and $field_name for futher using are
+    // appended to the settings array and extracted too.
+    $settings = $this->saveNumberFormDisplaySettings($field, $field_name, $get_random_settings = []);
+    extract($settings);
+
+    entity_get_display('entity_test', 'entity_test', 'default')
+      ->setComponent($field_name, array(
+        'type' => 'number_decimal',
+      ))
+      ->save();
+
+    // $id = the id of the created entity.
+    $id = $this->displaySubmitAssertForm($settings);
+
+    // Try to create entries with more than one decimal separator; assert fail.
+    $wrong_entries = array(
+      '3.14.159',
+      '0..45469',
+      '..4589',
+      '6.459.52',
+      '6.3..25',
+    );
+
+    foreach ($wrong_entries as $wrong_entry) {
+      $this->drupalGet('entity_test/add');
+      $edit = array(
+        "{$field_name}[0][value]" => $wrong_entry,
+      );
+      $this->drupalPostForm(NULL, $edit, t('Save'));
+      $this->assertRaw(t('%name must be a number.', array('%name' => $field_name)), 'Correctly failed to save decimal value with more than one decimal point.');
+    }
+
+    // Try to create entries with minus sign not in the first position.
+    $wrong_entries = array(
+      '3-3',
+      '4-',
+      '1.3-',
+      '1.2-4',
+      '-10-10',
+    );
+
+    foreach ($wrong_entries as $wrong_entry) {
+      $this->drupalGet('entity_test/add');
+      $edit = array(
+        "{$field_name}[0][value]" => $wrong_entry,
+      );
+      $this->drupalPostForm(NULL, $edit, t('Save'));
+      $this->assertRaw(t('%name must be a number.', array('%name' => $field_name)), 'Correctly failed to save decimal value with minus sign in the wrong position.');
+    }
+
+    // Edit the field settings with new explicit values.
+    $settings = array(
+      'placeholder' => 'PlaceholderDecimal',
+      'min' => '-8.8888',
+      'max' => '13.3332',
+      'default_value' => '0',
+      'value' => '2.2222',
+      'step' => '2.2222',
+      'prefix' => 'PrefixDecimal',
+      'suffix' => 'SuffixDecimal',
+    );
+
+    // As the field's base settings min may not be decreased and max
+    // increased on a form display mode, so let's set those on the field
+    // in order to not depend on dynamically generated random min and max.
+    $field->setSettings(['min' => '-8.8888', 'max' => '13.3332']);
+    $field->save();
+
+    $saved_settings = $this->saveNumberFormDisplaySettings($field, $field_name, $settings);
+    extract($saved_settings);
+    // Check if the entity works with new settings.
+    $id = $this->displaySubmitAssertForm($saved_settings);
+
+    // Try to create entries with wrong steps.
+    $wrong_steps = array(
+      '2.2224',
+      '1.1111',
+      '1',
+      '0.5',
+    );
+
+    foreach ($wrong_steps as $wrong_step) {
+      $this->drupalGet('entity_test/add');
+      $edit = array(
+        "{$field_name}[0][value]" => (string) ($value + $wrong_step),
+      );
+      $this->drupalPostForm(NULL, $edit, t('Save'));
+      $this->assertRaw(t('%name is not a valid number.', array('%name' => $field_name)), 'Correctly failed to save decimal value ' . $edit["{$field_name}[0][value]"] . ' added with the wrong step ' . $wrong_step . ' instead of ' . $step . '.');
+    }
+  }
+
+  /**
+   * Test integer field.
+   */
+  public function testNumberIntegerField() {
+    // Create a field to validate.
+    $field = $this->createNumberField('integer');
+    $field_name = $field->getName();
+    $storage = $field->getFieldStorageDefinition();
+    $base_settings = $field->getItemDefinition()->getSettings();
+    $settings = $this->saveNumberFormDisplaySettings($field, $field_name, $get_random_settings = []);
+    extract($settings);
+
+    entity_get_display('entity_test', 'entity_test', 'default')
+      ->setComponent($field_name, array(
+        'type' => 'number_integer',
+        'settings' => array(
+          'prefix_suffix' => FALSE,
+        ),
+      ))
+      ->save();
+    // Check the storage schema.
+    $expected = array(
+      'columns' => array(
+        'value' => array(
+          'type' => 'int',
+          'unsigned' => '',
+          'size' => 'normal',
+        ),
+      ),
+      'unique keys' => array(),
+      'indexes' => array(),
+      'foreign keys' => array(),
+    );
+    $this->assertEqual($storage->getSchema(), $expected);
+    $id = $this->displaySubmitAssertForm($settings);
+
+    // Try to set a value below the minimum value.
+    $this->drupalGet('entity_test/add');
+    $edit = array(
+      "{$field_name}[0][value]" => $min - 1,
+    );
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+    $this->assertRaw(t('%name must be higher than or equal to %minimum.', array('%name' => $field_name, '%minimum' => $min)), 'Correctly failed to save integer value less than minimum allowed value.');
+
+    // Try to set a decimal value.
+    $this->drupalGet('entity_test/add');
+    $edit = array(
+      "{$field_name}[0][value]" => $min + 0.5,
+    );
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+    $this->assertRaw(t('%name is not a valid number.', array('%name' => $field_name)), 'Correctly failed to save decimal value to integer field.');
+
+    // Try to set a value above the maximum value.
+    $this->drupalGet('entity_test/add');
+    $edit = array(
+      "{$field_name}[0][value]" => $max + 1,
+    );
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+    $this->assertRaw(t('%name must be lower than or equal to %maximum.', array('%name' => $field_name, '%maximum' => $max)), 'Correctly failed to save integer value greater than maximum allowed value.');
+
+    // Try to set a wrong integer value.
+    $this->drupalGet('entity_test/add');
+    $edit = array(
+      "{$field_name}[0][value]" => '20-40',
+    );
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+    $this->assertRaw(t('%name must be a number.', array('%name' => $field_name)), 'Correctly failed to save wrong integer value.');
+
+    // Test for the content attribute when prefix and suffix are set to display
+    // or not on a field display formatter (sic!) setting. Note that only prefix
+    // and suffix set on field base settings are displayed here.
+    // For the test use valid values in the min-max range.
+    // @todo: consider moving this to testNumberFormatter().
+    $i = 0;
+    $not = 'not';
+    $method = 'assertNoFieldByXpath';
+    $value = $min;
+
+    while (($value += $step) && $value < $max) {
+      if ($value == $default_value) {
+        continue;
+      }
+      elseif ($i == 3) {
+        $not = '';
+        $method = 'assertFieldByXpath';
+        entity_get_display('entity_test', 'entity_test', 'default')
+          ->setComponent($field_name, array(
+            'type' => 'number_integer',
+            'settings' => array(
+              'prefix_suffix' => TRUE,
+            ),
+          ))
+          ->save();
+      }
+      elseif ($i > 5) {
+        break;
+      }
+      $i++;
+
+      $this->drupalGet('entity_test/add');
+      $edit = array(
+        "{$field_name}[0][value]" => (string) $value,
+      );
+      $this->drupalPostForm(NULL, $edit, t('Save'));
+      preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
+      $id = isset($match[1]) ? $match[1] : '';
+      $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created');
+      $this->drupalGet('entity_test/' . $id);
+      $this->{$method}('//div[@content="' . $value . '"]', $base_settings['prefix'] . $value . $base_settings['suffix'], 'The "content" attribute has ' . $not . ' been set to the value of the field, and the ' . $base_settings['prefix'] . ' and ' . $base_settings['suffix'] . ' set on field base settings are ' . $not . ' being displayed.');
+    }
+
+    // Edit the field settings with the new explicit values.
+    $settings = array(
+      'placeholder' => 'PlaceholderInteger',
+      'min' => '-8888',
+      'max' => '13332',
+      'default_value' => '0',
+      'value' => '2222',
+      'step' => '2222',
+      'prefix' => 'PrefixInteger',
+      'suffix' => 'SuffixInteger',
+    );
+
+    $field->setSettings(['min' => '-8888', 'max' => '13332']);
+    $field->save();
+
+    $saved_settings = $this->saveNumberFormDisplaySettings($field, $field_name, $settings);
+    extract($saved_settings);
+    $id = $this->displaySubmitAssertForm($saved_settings);
+
+    // Try to create entries with wrong steps.
+    $wrong_steps = array(
+      '2224',
+      '1111',
+      '11',
+      '0.5',
+    );
+
+    foreach ($wrong_steps as $wrong_step) {
+      $this->drupalGet('entity_test/add');
+      $edit = array(
+        "{$field_name}[0][value]" => (string) ($value + $wrong_step),
+      );
+      $this->drupalPostForm(NULL, $edit, t('Save'));
+      $this->assertRaw(t('%name is not a valid number.', array('%name' => $field_name)), 'Correctly failed to save integer value ' . $edit["{$field_name}[0][value]"] . ' added with the wrong step ' . $wrong_step . ' instead of ' . $step . '.');
+    }
+  }
+
+  /**
+   * Test float field.
+   */
+  public function testNumberFloatField() {
+    // Create a field to validate.
+    $field = $this->createNumberField('float');
+    $field_name = $field->getName();
+    $settings = $this->saveNumberFormDisplaySettings($field, $field_name, $get_random_settings = []);
+    extract($settings);
+
+    entity_get_display('entity_test', 'entity_test', 'default')
+      ->setComponent($field_name, array(
+        'type' => 'number_decimal',
+      ))
+      ->save();
+
+    $id = $this->displaySubmitAssertForm($settings);
+
+    // Ensure that the 'number_decimal' formatter displays the number in a
+    // default format.
+    // @todo: consider to remove this as it is actually duplicate of
+    // the same testNumberFormatter() assert. Above all it sometimes failes on
+    // test entities, although on nodes in testNumberFormatter() works as expected.
+    // Also, formatting/rounding algorithm is not persistant and looks like as random.
+    $this->drupalGet('entity_test/' . $id);
+    $this->assertRaw(round($value, 2));
+
+    // Try to create entries with more than one decimal separator; assert fail.
+    $wrong_entries = array(
+      '3.14.159',
+      '0..45469',
+      '..4589',
+      '6.459.52',
+      '6.3..25',
+    );
+
+    foreach ($wrong_entries as $wrong_entry) {
+      $this->drupalGet('entity_test/add');
+      $edit = array(
+        "{$field_name}[0][value]" => $wrong_entry,
+      );
+      $this->drupalPostForm(NULL, $edit, t('Save'));
+      $this->assertRaw(t('%name must be a number.', array('%name' => $field_name)), 'Correctly failed to save float value with more than one decimal point.');
+    }
+
+    // Try to create entries with minus sign not in the first position.
+    $wrong_entries = array(
+      '3-3',
+      '4-',
+      '1.3-',
+      '1.2-4',
+      '-10-10',
+    );
+
+    foreach ($wrong_entries as $wrong_entry) {
+      $this->drupalGet('entity_test/add');
+      $edit = array(
+        "{$field_name}[0][value]" => $wrong_entry,
+      );
+      $this->drupalPostForm(NULL, $edit, t('Save'));
+      $this->assertRaw(t('%name must be a number.', array('%name' => $field_name)), 'Correctly failed to save float value with minus sign in the wrong position.');
+    }
+
+    // Edit the field settings with the new explicit values.
+    $settings = array(
+      'placeholder' => 'PlaceholderFloat',
+      'min' => '-49.38268',
+      'max' => '74.07402',
+      'default_value' => '0',
+      'value' => '12.34567',
+      'step' => '12.34567',
+      'prefix' => 'PrefixFloat',
+      'suffix' => 'SuffixFloat',
+    );
+
+    $field->setSettings(['min' => '-49.38268', 'max' => '74.07402']);
+    $field->save();
+
+    $saved_settings = $this->saveNumberFormDisplaySettings($field, $field_name, $settings);
+    extract($saved_settings);
+    $id = $this->displaySubmitAssertForm($saved_settings);
+
+    // Try to create entries with wrong steps.
+    $wrong_steps = array(
+      '22.22234',
+      '11.11111',
+      '1',
+      '0.00012',
+    );
+
+    foreach ($wrong_steps as $wrong_step) {
+      $this->drupalGet('entity_test/add');
+      $edit = array(
+        "{$field_name}[0][value]" => (string) ($value + $wrong_step),
+      );
+      $this->drupalPostForm(NULL, $edit, t('Save'));
+      $this->assertRaw(t('%name is not a valid number.', array('%name' => $field_name)), 'Correctly failed to save float value ' . $edit["{$field_name}[0][value]"] . ' added with the wrong step ' . $wrong_step . ' instead of ' . $step . '.');
+    }
+  }
+
+  /**
+   * Test default formatter behavior.
+   */
+  public function testNumberFormatter() {
+    $type = Unicode::strtolower($this->randomMachineName());
+    $float_field = Unicode::strtolower($this->randomMachineName());
+    $integer_field = Unicode::strtolower($this->randomMachineName());
+    $thousand_separators = array('', '.', ',', ' ', chr(8201), "'");
+    $decimal_separators = array('.', ',');
+    $prefix = $this->randomMachineName();
+    $suffix = $this->randomMachineName();
+    $random_float = rand(0, pow(10, 6));
+    $random_integer = rand(0, pow(10, 6));
+
+    // Create a content type containing float and integer fields.
+    $this->drupalCreateContentType(array('type' => $type));
+
+    FieldStorageConfig::create(array(
+      'field_name' => $float_field,
+      'entity_type' => 'node',
+      'type' => 'float',
+    ))->save();
+
+    FieldStorageConfig::create(array(
+      'field_name' => $integer_field,
+      'entity_type' => 'node',
+      'type' => 'integer',
+    ))->save();
+
+    FieldConfig::create([
+      'field_name' => $float_field,
+      'entity_type' => 'node',
+      'bundle' => $type,
+      'settings' => array(
+        'prefix' => $prefix,
+        'suffix' => $suffix,
+      ),
+    ])->save();
+
+    FieldConfig::create([
+      'field_name' => $integer_field,
+      'entity_type' => 'node',
+      'bundle' => $type,
+      'settings' => array(
+        'prefix' => $prefix,
+        'suffix' => $suffix,
+      ),
+    ])->save();
+
+    entity_get_form_display('node', $type, 'default')
+      ->setComponent($float_field, array(
+        'type' => 'number',
+        'settings' => array(
+          'placeholder' => '0.00',
+        ),
+      ))
+      ->setComponent($integer_field, array(
+        'type' => 'number',
+        'settings' => array(
+          'placeholder' => '0.00',
+        ),
+      ))
+      ->save();
+
+    entity_get_display('node', $type, 'default')
+      ->setComponent($float_field, array(
+        'type' => 'number_decimal',
+      ))
+      ->setComponent($integer_field, array(
+        'type' => 'number_unformatted',
+      ))
+      ->save();
+
+    // Create a node to test formatters.
+    $node = Node::create([
+      'type' => $type,
+      'title' => $this->randomMachineName(),
+      $float_field => ['value' => $random_float],
+      $integer_field => ['value' => $random_integer],
+    ]);
+    $node->save();
+
+    // Go to manage display page.
+    $this->drupalGet("admin/structure/types/manage/$type/display");
+
+    // Configure number_decimal formatter for the 'float' field type.
+    $thousand_separator = $thousand_separators[array_rand($thousand_separators)];
+    $decimal_separator = $decimal_separators[array_rand($decimal_separators)];
+    $scale = rand(0, 10);
+
+    $this->drupalPostAjaxForm(NULL, array(), "${float_field}_settings_edit");
+    $edit = array(
+      "fields[${float_field}][settings_edit_form][settings][prefix_suffix]" => TRUE,
+      "fields[${float_field}][settings_edit_form][settings][scale]" => $scale,
+      "fields[${float_field}][settings_edit_form][settings][decimal_separator]" => $decimal_separator,
+      "fields[${float_field}][settings_edit_form][settings][thousand_separator]" => $thousand_separator,
+    );
+    $this->drupalPostAjaxForm(NULL, $edit, "${float_field}_plugin_settings_update");
+    $this->drupalPostForm(NULL, array(), t('Save'));
+
+    // Check number_decimal and number_unformatted formatters behavior.
+    $this->drupalGet('node/' . $node->id());
+    $float_formatted = number_format($random_float, $scale, $decimal_separator, $thousand_separator);
+    $this->assertRaw("$prefix$float_formatted$suffix", 'Prefix and suffix added');
+    $this->assertRaw((string) $random_integer);
+
+    // Configure the number_decimal formatter.
+    entity_get_display('node', $type, 'default')
+      ->setComponent($integer_field, array(
+        'type' => 'number_integer',
+      ))
+      ->save();
+    $this->drupalGet("admin/structure/types/manage/$type/display");
+
+    $thousand_separator = $thousand_separators[array_rand($thousand_separators)];
+
+    $this->drupalPostAjaxForm(NULL, array(), "${integer_field}_settings_edit");
+    $edit = array(
+      "fields[${integer_field}][settings_edit_form][settings][prefix_suffix]" => FALSE,
+      "fields[${integer_field}][settings_edit_form][settings][thousand_separator]" => $thousand_separator,
+    );
+    $this->drupalPostAjaxForm(NULL, $edit, "${integer_field}_plugin_settings_update");
+    $this->drupalPostForm(NULL, array(), t('Save'));
+
+    // Check number_integer formatter behavior.
+    $this->drupalGet('node/' . $node->id());
+
+    $integer_formatted = number_format($random_integer, 0, '', $thousand_separator);
+    $this->assertRaw($integer_formatted, 'Random integer formatted');
+  }
+
+  /**
+   * Tests setting the minimum value of a float field through the interface.
+   */
+  public function testCreateNumberFloatField() {
+    // Create a float field.
+    $field = $this->createNumberField('float', [], ['min' => '0']);
+
+    // Set the minimum value to a float value.
+    $this->assertSetMinimumValue($field, 0.0001);
+    // Set the minimum value to an integer value.
+    $this->assertSetMinimumValue($field, 1);
+  }
+
+  /**
+   * Tests setting the minimum value of a decimal field through the interface.
+   */
+  public function testCreateNumberDecimalField() {
+    // Create a decimal field.
+    $field = $this->createNumberField('decimal', [], ['min' => '0']);
+
+    // Set the minimum value to a decimal value.
+    $this->assertSetMinimumValue($field, 0.1);
+    // Set the minimum value to an integer value.
+    $this->assertSetMinimumValue($field, 1);
+  }
+
+  /**
+   * Helper function to set the minimum value of a field.
+   */
+  private function assertSetMinimumValue($field, $minimum_value) {
+    $field_configuration_url = 'entity_test/structure/entity_test/fields/entity_test.entity_test.' . $field->getName();
+
+    // Set the minimum value.
+    $edit = array(
+      'settings[min]' => $minimum_value,
+    );
+    $this->drupalPostForm($field_configuration_url, $edit, t('Save settings'));
+    // Check if an error message is shown.
+    $this->assertNoRaw(t('%name is not a valid number.', array('%name' => t('Minimum'))), 'Saved ' . gettype($minimum_value) . '  value as minimal value on a ' . $field->getType() . ' field');
+    // Check if a success message is shown.
+    $this->assertRaw(t('Saved %label configuration.', array('%label' => $field->getLabel())));
+    // Check if the minimum value was actually set.
+    $this->drupalGet($field_configuration_url);
+    $this->assertFieldById('edit-settings-min', $minimum_value, 'Minimal ' . gettype($minimum_value) . '  value was set on a ' . $field->getType() . ' field.');
+  }
+
+  /**
+   * Creates a number field of the given type with optional settings.
+   */
+  private function createNumberField($type, $config_settings = [], $field_settings = []) {
+    $field_name = Unicode::strtolower($this->randomMachineName());
+    $config = array(
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => $type,
+    );
+    if (!empty($config_settings)) {
+      $config['settings'] = $config_settings;
+    }
+    $storage = FieldStorageConfig::create($config);
+    $storage->save();
+
+    $field = [
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+    ];
+    if (!empty($field_settings)) {
+      $field['settings'] = $field_settings;
+    }
+    else {
+      // Set up default random settings for a field.
+      $field['settings'] = $this->getRandomNumberSettings($storage);
+    }
+    $field = FieldConfig::create($field);
+    $field->save();
+
+    return $field;
+  }
+
+  /**
+   * Helper function to set up a number field random values.
+   */
+  private function getRandomNumberSettings($field) {
+    // The highest number to choose random values from.
+    $ceil = 9999;
+    $off = COMMERCE_NUMBER_FIELD_TEST_DECIMALS_OFFSET;
+    $ceil = $ceil < $off * 2 ? $off * 2 : $ceil;
+    $value = $step = '';
+    $type = $field->getType();
+    $settings = $field->getSettings();
+    extract($settings);
+    $init_min = empty($unsigned) ? rand(-$ceil, 0) : rand(0, $ceil - $off);
+    $no_min = !isset($min) || !is_numeric($min);
+    $no_max = !isset($max) || !is_numeric($max);
+
+    // We need to substract 3 from min-max range in order to have a place for a
+    // value and default_value (+.decimals). For example, if happens $min = 0
+    // then $max = 3-9999 AND $default_value = 1-9998 AND $value = 2-9998.
+    $min = $no_min ? $init_min : rand($min, $no_max ? $ceil - $off : $max);
+    $max = $no_max ? rand($min + $off, $ceil) : rand($min + $off, $max);
+    $value = rand($min + 1, $max - 1);
+    $default_value = rand($min + 1, $max - 1);
+    if (isset($settings['min'])) {
+      $min = $min < $settings['min'] ? $settings['min'] : $min;
+    }
+    if (isset($settings['max'])) {
+      $max = $max > $settings['max'] ? $settings['max'] : $max;
+    }
+
+    if ($type == 'integer') {
+      $valid = $min;
+      $tmp_max = $max;
+      $tmp_value = $value;
+      $tmp_default_value = $default_value;
+      $half = abs($max - $min) / 2;
+      $half = $half > 2 ? $half : 1;
+      $step = $half == 1 ? $half : $half + 1;
+
+      while ($step > $half) {
+        $step = explode('0.', $this->getRandomStep($scale = rand(1, strlen($max))))[1] + 0;
+      }
+      while ($tmp_max >= $valid) {
+        $default_value = $tmp_default_value > $valid ? $valid : $default_value;
+        $value = $tmp_value > $valid ? $valid : $value;
+        $max = $valid;
+        $valid += $step;
+      }
+      while ($default_value == $value && $default_value >= $min) {
+        $default_value = $valid = $valid - $step;
+      }
+    }
+    elseif ($type == 'decimal' || $type == 'float') {
+      // Float type has no $scale, so we use any scale in a range 1-9.
+      $scale = empty($scale) ? rand(1, 9) : $scale;
+      extract($this->getRandomFloatValues($scale, $min, $max, $value, $default_value));
+    }
+
+    return array(
+      'placeholder' => 'RandomPlaceholder-' . $this->randomMachineName(),
+      'min' => (string) $min,
+      'max' => (string) $max,
+      'default_value' => (string) $default_value,
+      'value' => (string) $value,
+      'step' => (string) $step,
+      'prefix' => 'RandomPrefix-' . $this->randomMachineName(),
+      'suffix' => 'RandomSuffix-' . $this->randomMachineName(),
+    );
+  }
+
+  /**
+   * Helper function to get random float step, min, max, value, default_value.
+   */
+  private function getRandomFloatValues($scale, $min, $max, $value, $default_value) {
+    $values = [];
+    // Use PHP BCMath functions in order to get valid float numbers.
+    $half = bcdiv(abs(bcsub($max, $min, $scale)), 2, $scale) + 0;
+    $values['min'] = $min = $valid = bcadd($min, $this->getRandomStep($scale), $scale) + 0;
+    $values['default_value'] = $default_value = $default_value < $min ? $min : $default_value;
+    $values['value'] = $value = $value < $min ? $min : $value;
+    $values['step'] = $step = ($this->getRandomStep($scale) + 0) + rand(0, strlen($max));
+    $pow = pow(0.1, $scale);
+
+    while (bccomp($step, $half, $scale) >= 0 && bccomp($step, $pow, $scale) == 1) {
+      $values['step'] = $step = bcsub($step, $pow, $scale);
+    }
+    while (bccomp($max, $valid, $scale) >= 0) {
+      $values['default_value'] = bccomp($default_value, $valid, $scale) == 1 ? $valid : $values['default_value'];
+      $values['value'] = bccomp($value, $valid, $scale) == 1 ? $valid : $values['value'];
+      $values['max'] = $valid;
+      $valid = bcadd($valid, $step, $scale) + 0;
+    }
+    while (bccomp($values['default_value'], $values['value'], $scale) == 0 && bccomp($values['default_value'], $min, $scale) >= 0) {
+      $values['default_value'] = $valid = bcsub($valid, $step, $scale) + 0;
+    }
+
+    return $values;
+  }
+
+  /**
+   * Helper function to get a random step.
+   */
+  private function getRandomStep($scale) {
+    $pow = pow(0.1, $scale);
+    $step = $pow * substr(mt_rand(), 0, $scale);
+    return empty($step) ? $pow : $step;
+  }
+
+  /**
+   * Helper function to save a number field attributes for the form display.
+   */
+  private function saveNumberFormDisplaySettings($field, $field_name, $test_settings = []) {
+    $settings = empty($test_settings) ? $this->getRandomNumberSettings($field) : $test_settings;
+
+    $widget = entity_get_form_display('entity_test', 'entity_test', 'default');
+    $widget->setComponent($field_name, array(
+      'type' => 'commerce_number',
+      'settings' => $settings,
+    ))
+      ->save();
+
+    $widget_settings = $widget->getRenderer($field_name)->getFormDisplayModeSettings();
+    // As only default_value is saved on the widget we need to restore a value
+    // prepared by getRandomNumberSettings() for a "user" to insert in the field.
+    $widget_settings['value'] = $settings['value'];
+    $widget_settings['field_name'] = $field_name;
+
+    return $widget_settings;
+  }
+
+  /**
+   * Helper function to display and submit a number field.
+   */
+  private function displaySubmitAssertForm($settings) {
+    extract($settings);
+    // Display creation form.
+    $this->drupalGet('entity_test/add');
+    $this->assertFieldByName("{$field_name}[0][value]", '', 'Widget is displayed');
+    $this->assertNumberFieldAttributes($settings);
+
+    // Add the $value and submit the field.
+    $edit = array(
+      "{$field_name}[0][value]" => $value,
+    );
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+    preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
+    // Check $match[] for existance and let the test just fail. No exceptions thrown.
+    $id = isset($match[1]) ? $match[1] : '';
+    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created');
+    $this->assertNumberAfterFormSubmit($settings);
+
+    return $id;
+  }
+
+  /**
+   * Helper function to assert a number field attributes.
+   */
+  private function assertNumberFieldAttributes($settings) {
+    extract($settings);
+    $this->assertRaw('placeholder="' . $placeholder . '"');
+    $this->assertRaw('min="' . $min . '"');
+    $this->assertRaw('max="' . $max . '"');
+    $this->assertRaw('value="' . $default_value . '"', 'Raw default value "' . $default_value . '" found');
+    $this->assertRaw('step="' . $step . '"');
+    $this->assertRaw($prefix);
+    $this->assertRaw($suffix);
+  }
+
+  /**
+   * Helper function to assert a number field after form submit.
+   */
+  private function assertNumberAfterFormSubmit($settings) {
+    extract($settings);
+    // Check common errors and as a consiquence value="$value" is left in place.
+    $this->assertNoRaw(t('%name must be higher than or equal to %minimum.', array('%name' => $field_name, '%minimum' => $min)), 'Submitted value ' . $value . ' higher than or equal to minimum ' . $min);
+    $this->assertNoRaw(t('%name must be lower than or equal to %maximum.', array('%name' => $field_name, '%maximum' => $max)), 'Submitted value ' . $value . ' lower than or equal to maximum ' . $max);
+    $this->assertNoRaw(t('%name must be a number.', array('%name' => $field_name)), 'Submitted value ' . $value . ' is numeric.');
+    $this->assertNoRaw(t('%name is not a valid number.', array('%name' => $field_name)), 'Submitted value ' . $value . ' is valid number.');
+    // The attribute value="$value" need to be checked instead of string $value
+    // as there are may be similar strings on a page.
+    $this->assertNoRaw('value="' . $value . '"', 'Submitted value ' . $value . ' cleared out after form submit.');
+  }
+
+}
+
+/**
+ * The offset for .decimals in a min-max range to keep values not adjacent
+ * to each other.
+ */
+if (!defined('COMMERCE_NUMBER_FIELD_TEST_DECIMALS_OFFSET')) {
+  define('COMMERCE_NUMBER_FIELD_TEST_DECIMALS_OFFSET', 3);
+}