Skip to content

Commit 748eb15

Browse files
VeronikaYaratsVeronikaYarats
committed
Merge remote-tracking branch 'remotes/github/MAGETWO-94444' into EPAM-PR-30
2 parents f82857b + c96e32c commit 748eb15

File tree

8 files changed

+323
-320
lines changed

8 files changed

+323
-320
lines changed

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
*/
1212
namespace Magento\Catalog\Block\Adminhtml\Category\Helper;
1313

14+
/**
15+
* Pricestep Helper
16+
*/
1417
class Pricestep extends \Magento\Framework\Data\Form\Element\Text
1518
{
1619
/**
@@ -40,7 +43,7 @@ public function getElementHtml()
4043
$disabled = true;
4144
}
4245

43-
parent::addClass('validate-number validate-number-range number-range-0.01-1000000000');
46+
parent::addClass('validate-number validate-number-range number-range-0.01-9999999999999999');
4447
$html = parent::getElementHtml();
4548
$htmlId = 'use_config_' . $this->getHtmlId();
4649
$html .= '<br/><input id="' . $htmlId . '" name="use_config[]" value="' . $this->getId() . '"';

‎app/code/Magento/CatalogRule/etc/db_schema.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<column xsi:type="int" name="sort_order" padding="10" unsigned="true" nullable="false" identity="false"
2424
default="0" comment="Sort Order"/>
2525
<column xsi:type="varchar" name="simple_action" nullable="true" length="32" comment="Simple Action"/>
26-
<column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
26+
<column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="false"
2727
default="0" comment="Discount Amount"/>
2828
<constraint xsi:type="primary" referenceId="PRIMARY">
2929
<column name="rule_id"/>
@@ -49,7 +49,7 @@
4949
default="0" comment="Product Id"/>
5050
<column xsi:type="varchar" name="action_operator" nullable="true" length="10" default="to_fixed"
5151
comment="Action Operator"/>
52-
<column xsi:type="decimal" name="action_amount" scale="4" precision="12" unsigned="false" nullable="false"
52+
<column xsi:type="decimal" name="action_amount" scale="4" precision="20" unsigned="false" nullable="false"
5353
default="0" comment="Action Amount"/>
5454
<column xsi:type="smallint" name="action_stop" padding="6" unsigned="false" nullable="false" identity="false"
5555
default="0" comment="Action Stop"/>

‎app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</field>
2121
<field id="price_range_step" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
2222
<label>Default Price Navigation Step</label>
23-
<validate>validate-number validate-number-range number-range-0.01-1000000000</validate>
23+
<validate>validate-number validate-number-range number-range-0.01-9999999999999999</validate>
2424
<depends>
2525
<field id="price_range_calculation">manual</field>
2626
</depends>

‎app/code/Magento/NewRelicReporting/etc/db_schema.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
comment="Entity ID"/>
3939
<column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
4040
comment="Customer ID"/>
41-
<column xsi:type="decimal" name="total" scale="0" precision="10" unsigned="true" nullable="true"/>
42-
<column xsi:type="decimal" name="total_base" scale="0" precision="10" unsigned="true" nullable="true"/>
41+
<column xsi:type="decimal" name="total" scale="4" precision="20" unsigned="true" nullable="true"/>
42+
<column xsi:type="decimal" name="total_base" scale="4" precision="20" unsigned="true" nullable="true"/>
4343
<column xsi:type="int" name="item_count" padding="10" unsigned="true" nullable="false" identity="false"
4444
comment="Line Item Count"/>
4545
<column xsi:type="timestamp" name="updated_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"

‎app/code/Magento/Quote/Model/QuoteValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class QuoteValidator
2525
/**
2626
* Maximum available number
2727
*/
28-
const MAXIMUM_AVAILABLE_NUMBER = 99999999;
28+
const MAXIMUM_AVAILABLE_NUMBER = 10000000000000000;
2929

3030
/**
3131
* @var AllowedCountries

‎app/code/Magento/Quote/etc/db_schema.xml

Lines changed: 61 additions & 61 deletions
Large diffs are not rendered by default.

‎app/code/Magento/Sales/etc/db_schema.xml

Lines changed: 242 additions & 242 deletions
Large diffs are not rendered by default.

‎app/code/Magento/SalesRule/etc/db_schema.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -208,17 +208,17 @@
208208
<column xsi:type="varchar" name="coupon_code" nullable="true" length="50" comment="Coupon Code"/>
209209
<column xsi:type="int" name="coupon_uses" padding="11" unsigned="false" nullable="false" identity="false"
210210
default="0" comment="Coupon Uses"/>
211-
<column xsi:type="decimal" name="subtotal_amount" scale="4" precision="12" unsigned="false" nullable="false"
211+
<column xsi:type="decimal" name="subtotal_amount" scale="4" precision="20" unsigned="false" nullable="false"
212212
default="0" comment="Subtotal Amount"/>
213213
<column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
214214
default="0" comment="Discount Amount"/>
215-
<column xsi:type="decimal" name="total_amount" scale="4" precision="12" unsigned="false" nullable="false"
215+
<column xsi:type="decimal" name="total_amount" scale="4" precision="20" unsigned="false" nullable="false"
216216
default="0" comment="Total Amount"/>
217-
<column xsi:type="decimal" name="subtotal_amount_actual" scale="4" precision="12" unsigned="false"
217+
<column xsi:type="decimal" name="subtotal_amount_actual" scale="4" precision="20" unsigned="false"
218218
nullable="false" default="0" comment="Subtotal Amount Actual"/>
219219
<column xsi:type="decimal" name="discount_amount_actual" scale="4" precision="12" unsigned="false"
220220
nullable="false" default="0" comment="Discount Amount Actual"/>
221-
<column xsi:type="decimal" name="total_amount_actual" scale="4" precision="12" unsigned="false"
221+
<column xsi:type="decimal" name="total_amount_actual" scale="4" precision="20" unsigned="false"
222222
nullable="false" default="0" comment="Total Amount Actual"/>
223223
<column xsi:type="varchar" name="rule_name" nullable="true" length="255" comment="Rule Name"/>
224224
<constraint xsi:type="primary" referenceId="PRIMARY">
@@ -250,17 +250,17 @@
250250
<column xsi:type="varchar" name="coupon_code" nullable="true" length="50" comment="Coupon Code"/>
251251
<column xsi:type="int" name="coupon_uses" padding="11" unsigned="false" nullable="false" identity="false"
252252
default="0" comment="Coupon Uses"/>
253-
<column xsi:type="decimal" name="subtotal_amount" scale="4" precision="12" unsigned="false" nullable="false"
253+
<column xsi:type="decimal" name="subtotal_amount" scale="4" precision="20" unsigned="false" nullable="false"
254254
default="0" comment="Subtotal Amount"/>
255255
<column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
256256
default="0" comment="Discount Amount"/>
257-
<column xsi:type="decimal" name="total_amount" scale="4" precision="12" unsigned="false" nullable="false"
257+
<column xsi:type="decimal" name="total_amount" scale="4" precision="20" unsigned="false" nullable="false"
258258
default="0" comment="Total Amount"/>
259-
<column xsi:type="decimal" name="subtotal_amount_actual" scale="4" precision="12" unsigned="false"
259+
<column xsi:type="decimal" name="subtotal_amount_actual" scale="4" precision="20" unsigned="false"
260260
nullable="false" default="0" comment="Subtotal Amount Actual"/>
261261
<column xsi:type="decimal" name="discount_amount_actual" scale="4" precision="12" unsigned="false"
262262
nullable="false" default="0" comment="Discount Amount Actual"/>
263-
<column xsi:type="decimal" name="total_amount_actual" scale="4" precision="12" unsigned="false"
263+
<column xsi:type="decimal" name="total_amount_actual" scale="4" precision="20" unsigned="false"
264264
nullable="false" default="0" comment="Total Amount Actual"/>
265265
<column xsi:type="varchar" name="rule_name" nullable="true" length="255" comment="Rule Name"/>
266266
<constraint xsi:type="primary" referenceId="PRIMARY">
@@ -292,11 +292,11 @@
292292
<column xsi:type="varchar" name="coupon_code" nullable="true" length="50" comment="Coupon Code"/>
293293
<column xsi:type="int" name="coupon_uses" padding="11" unsigned="false" nullable="false" identity="false"
294294
default="0" comment="Coupon Uses"/>
295-
<column xsi:type="decimal" name="subtotal_amount" scale="4" precision="12" unsigned="false" nullable="false"
295+
<column xsi:type="decimal" name="subtotal_amount" scale="4" precision="20" unsigned="false" nullable="false"
296296
default="0" comment="Subtotal Amount"/>
297297
<column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
298298
default="0" comment="Discount Amount"/>
299-
<column xsi:type="decimal" name="total_amount" scale="4" precision="12" unsigned="false" nullable="false"
299+
<column xsi:type="decimal" name="total_amount" scale="4" precision="20" unsigned="false" nullable="false"
300300
default="0" comment="Total Amount"/>
301301
<column xsi:type="varchar" name="rule_name" nullable="true" length="255" comment="Rule Name"/>
302302
<constraint xsi:type="primary" referenceId="PRIMARY">

0 commit comments

Comments
 (0)