Skip to content

Commit c212f14

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-92136' into 2.3-develop-pr22
2 parents 73c97af + a9e9127 commit c212f14

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,8 @@ private function getTierPriceStructure($tierPricePath)
500500
'validation' => [
501501
'required-entry' => true,
502502
'validate-greater-than-zero' => true,
503-
'validate-digits' => true,
503+
'validate-digits' => false,
504+
'validate-number' => true,
504505
],
505506
],
506507
],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ protected function customizeAdvancedPriceFormat(array $data)
122122
$value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE] =
123123
$this->formatPrice($value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE]);
124124
$value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY] =
125-
(int)$value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY];
125+
(float) $value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY];
126126
}
127127
}
128128

app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Magento\CatalogInventory\Api\Data\StockItemInterface;
1212
use Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory;
1313
use Magento\CatalogInventory\Api\StockConfigurationInterface;
14-
use Magento\CatalogInventory\Api\StockItemRepositoryInterface as StockItemRepositoryInterface;
14+
use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
1515
use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
1616
use Magento\CatalogInventory\Model\ResourceModel\Stock\Item as StockItemResource;
1717
use Magento\CatalogInventory\Model\Spi\StockStateProviderInterface;

app/code/Magento/CatalogInventory/view/adminhtml/web/js/components/qty-validator-changer.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ define([
2020
var isDigits = value !== 1;
2121

2222
this.validation['validate-integer'] = isDigits;
23+
this.validation['validate-digits'] = isDigits;
2324
this.validation['less-than-equals-to'] = isDigits ? 99999999 : 99999999.9999;
2425
this.validate();
2526
}

0 commit comments

Comments
 (0)