Skip to content

Commit ba74d84

Browse files
vprohorovvprohorov
committed
MAGETWO-94444: [2.3] Order total value is limited by 8 round digits
- Changed shipping, tax, discount fields
1 parent 99d04cd commit ba74d84

File tree

6 files changed

+220
-217
lines changed

6 files changed

+220
-217
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/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: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -151,21 +151,21 @@
151151
nullable="false" default="0" comment="Subtotal With Discount"/>
152152
<column xsi:type="decimal" name="base_subtotal_with_discount" scale="4" precision="20" unsigned="false"
153153
nullable="false" default="0" comment="Base Subtotal With Discount"/>
154-
<column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
154+
<column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="false"
155155
default="0" comment="Tax Amount"/>
156-
<column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
156+
<column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="false"
157157
default="0" comment="Base Tax Amount"/>
158-
<column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="false"
158+
<column xsi:type="decimal" name="shipping_amount" scale="4" precision="20" unsigned="false" nullable="false"
159159
default="0" comment="Shipping Amount"/>
160-
<column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
160+
<column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="20" unsigned="false"
161161
nullable="false" default="0" comment="Base Shipping Amount"/>
162-
<column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
162+
<column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
163163
comment="Shipping Tax Amount"/>
164-
<column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="12" unsigned="false"
164+
<column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="20" unsigned="false"
165165
nullable="true" comment="Base Shipping Tax Amount"/>
166-
<column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
166+
<column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="false"
167167
default="0" comment="Discount Amount"/>
168-
<column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
168+
<column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
169169
nullable="false" default="0" comment="Base Discount Amount"/>
170170
<column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="false"
171171
default="0" comment="Grand Total"/>
@@ -175,25 +175,25 @@
175175
<column xsi:type="text" name="applied_taxes" nullable="true" comment="Applied Taxes"/>
176176
<column xsi:type="varchar" name="discount_description" nullable="true" length="255"
177177
comment="Discount Description"/>
178-
<column xsi:type="decimal" name="shipping_discount_amount" scale="4" precision="12" unsigned="false"
178+
<column xsi:type="decimal" name="shipping_discount_amount" scale="4" precision="20" unsigned="false"
179179
nullable="true" comment="Shipping Discount Amount"/>
180-
<column xsi:type="decimal" name="base_shipping_discount_amount" scale="4" precision="12" unsigned="false"
180+
<column xsi:type="decimal" name="base_shipping_discount_amount" scale="4" precision="20" unsigned="false"
181181
nullable="true" comment="Base Shipping Discount Amount"/>
182182
<column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
183183
comment="Subtotal Incl Tax"/>
184184
<column xsi:type="decimal" name="base_subtotal_total_incl_tax" scale="4" precision="20" unsigned="false"
185185
nullable="true" comment="Base Subtotal Total Incl Tax"/>
186-
<column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
186+
<column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
187187
nullable="true" comment="Discount Tax Compensation Amount"/>
188-
<column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
188+
<column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
189189
unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
190-
<column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="12"
190+
<column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="20"
191191
unsigned="false" nullable="true" comment="Shipping Discount Tax Compensation Amount"/>
192-
<column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="12"
192+
<column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="20"
193193
unsigned="false" nullable="true" comment="Base Shipping Discount Tax Compensation Amount"/>
194-
<column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
194+
<column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
195195
comment="Shipping Incl Tax"/>
196-
<column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="12" unsigned="false"
196+
<column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="20" unsigned="false"
197197
nullable="true" comment="Base Shipping Incl Tax"/>
198198
<column xsi:type="text" name="vat_id" nullable="true" comment="Vat Id"/>
199199
<column xsi:type="smallint" name="vat_is_valid" padding="6" unsigned="false" nullable="true" identity="false"
@@ -249,45 +249,45 @@
249249
comment="Custom Price"/>
250250
<column xsi:type="decimal" name="discount_percent" scale="4" precision="12" unsigned="false" nullable="true"
251251
default="0" comment="Discount Percent"/>
252-
<column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
252+
<column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="true"
253253
default="0" comment="Discount Amount"/>
254-
<column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
254+
<column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
255255
nullable="true" default="0" comment="Base Discount Amount"/>
256256
<column xsi:type="decimal" name="tax_percent" scale="4" precision="12" unsigned="false" nullable="true"
257257
default="0" comment="Tax Percent"/>
258-
<column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
258+
<column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
259259
default="0" comment="Tax Amount"/>
260-
<column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
260+
<column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
261261
default="0" comment="Base Tax Amount"/>
262-
<column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="false"
262+
<column xsi:type="decimal" name="row_total" scale="4" precision="20" unsigned="false" nullable="false"
263263
default="0" comment="Row Total"/>
264-
<column xsi:type="decimal" name="base_row_total" scale="4" precision="12" unsigned="false" nullable="false"
264+
<column xsi:type="decimal" name="base_row_total" scale="4" precision="20" unsigned="false" nullable="false"
265265
default="0" comment="Base Row Total"/>
266-
<column xsi:type="decimal" name="row_total_with_discount" scale="4" precision="12" unsigned="false"
266+
<column xsi:type="decimal" name="row_total_with_discount" scale="4" precision="20" unsigned="false"
267267
nullable="true" default="0" comment="Row Total With Discount"/>
268268
<column xsi:type="decimal" name="row_weight" scale="4" precision="12" unsigned="false" nullable="true"
269269
default="0" comment="Row Weight"/>
270270
<column xsi:type="varchar" name="product_type" nullable="true" length="255" comment="Product Type"/>
271-
<column xsi:type="decimal" name="base_tax_before_discount" scale="4" precision="12" unsigned="false"
271+
<column xsi:type="decimal" name="base_tax_before_discount" scale="4" precision="20" unsigned="false"
272272
nullable="true" comment="Base Tax Before Discount"/>
273-
<column xsi:type="decimal" name="tax_before_discount" scale="4" precision="12" unsigned="false" nullable="true"
273+
<column xsi:type="decimal" name="tax_before_discount" scale="4" precision="20" unsigned="false" nullable="true"
274274
comment="Tax Before Discount"/>
275275
<column xsi:type="decimal" name="original_custom_price" scale="4" precision="12" unsigned="false"
276276
nullable="true" comment="Original Custom Price"/>
277277
<column xsi:type="varchar" name="redirect_url" nullable="true" length="255" comment="Redirect Url"/>
278278
<column xsi:type="decimal" name="base_cost" scale="4" precision="12" unsigned="false" nullable="true"
279279
comment="Base Cost"/>
280-
<column xsi:type="decimal" name="price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
280+
<column xsi:type="decimal" name="price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
281281
comment="Price Incl Tax"/>
282-
<column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
282+
<column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
283283
comment="Base Price Incl Tax"/>
284-
<column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
284+
<column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
285285
comment="Row Total Incl Tax"/>
286-
<column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="12" unsigned="false"
286+
<column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="20" unsigned="false"
287287
nullable="true" comment="Base Row Total Incl Tax"/>
288-
<column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
288+
<column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
289289
nullable="true" comment="Discount Tax Compensation Amount"/>
290-
<column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
290+
<column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
291291
unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
292292
<constraint xsi:type="primary" referenceId="PRIMARY">
293293
<column name="item_id"/>
@@ -330,19 +330,19 @@
330330
comment="Weight"/>
331331
<column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="false" default="0"
332332
comment="Qty"/>
333-
<column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
333+
<column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="true"
334334
default="0" comment="Discount Amount"/>
335-
<column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
335+
<column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
336336
default="0" comment="Tax Amount"/>
337-
<column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="false"
337+
<column xsi:type="decimal" name="row_total" scale="4" precision="20" unsigned="false" nullable="false"
338338
default="0" comment="Row Total"/>
339-
<column xsi:type="decimal" name="base_row_total" scale="4" precision="12" unsigned="false" nullable="false"
339+
<column xsi:type="decimal" name="base_row_total" scale="4" precision="20" unsigned="false" nullable="false"
340340
default="0" comment="Base Row Total"/>
341-
<column xsi:type="decimal" name="row_total_with_discount" scale="4" precision="12" unsigned="false"
341+
<column xsi:type="decimal" name="row_total_with_discount" scale="4" precision="20" unsigned="false"
342342
nullable="true" default="0" comment="Row Total With Discount"/>
343-
<column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
343+
<column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
344344
nullable="true" default="0" comment="Base Discount Amount"/>
345-
<column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
345+
<column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
346346
default="0" comment="Base Tax Amount"/>
347347
<column xsi:type="decimal" name="row_weight" scale="4" precision="12" unsigned="false" nullable="true"
348348
default="0" comment="Row Weight"/>
@@ -370,17 +370,17 @@
370370
comment="Base Price"/>
371371
<column xsi:type="decimal" name="base_cost" scale="4" precision="12" unsigned="false" nullable="true"
372372
comment="Base Cost"/>
373-
<column xsi:type="decimal" name="price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
373+
<column xsi:type="decimal" name="price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
374374
comment="Price Incl Tax"/>
375375
<column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
376376
comment="Base Price Incl Tax"/>
377377
<column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
378378
comment="Row Total Incl Tax"/>
379-
<column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="12" unsigned="false"
379+
<column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="20" unsigned="false"
380380
nullable="true" comment="Base Row Total Incl Tax"/>
381-
<column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
381+
<column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
382382
nullable="true" comment="Discount Tax Compensation Amount"/>
383-
<column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
383+
<column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
384384
unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
385385
<constraint xsi:type="primary" referenceId="PRIMARY">
386386
<column name="address_item_id"/>
@@ -472,7 +472,7 @@
472472
<column xsi:type="varchar" name="code" nullable="true" length="255" comment="Code"/>
473473
<column xsi:type="varchar" name="method" nullable="true" length="255" comment="Method"/>
474474
<column xsi:type="text" name="method_description" nullable="true" comment="Method Description"/>
475-
<column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
475+
<column xsi:type="decimal" name="price" scale="4" precision="20" unsigned="false" nullable="false" default="0"
476476
comment="Price"/>
477477
<column xsi:type="text" name="error_message" nullable="true" comment="Error Message"/>
478478
<column xsi:type="text" name="method_title" nullable="true" comment="Method Title"/>

0 commit comments

Comments
 (0)