Skip to content

Commit 5bc59cb

Browse files
magento-cicd2magento-cicd2
authored
merge magento/2.3-develop into magento-tango/PR-2019-05-13
2 parents bfa0056 + ef04c2c commit 5bc59cb

File tree

24 files changed

+353
-172
lines changed

24 files changed

+353
-172
lines changed

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
comment="Website Id"/>
9898
<column xsi:type="smallint" name="selection_price_type" padding="5" unsigned="true" nullable="false"
9999
identity="false" default="0" comment="Selection Price Type"/>
100-
<column xsi:type="decimal" name="selection_price_value" scale="4" precision="12" unsigned="false"
100+
<column xsi:type="decimal" name="selection_price_value" scale="6" precision="20" unsigned="false"
101101
nullable="false" default="0" comment="Selection Price Value"/>
102102
<column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
103103
comment="Parent Product Id"/>
@@ -125,9 +125,9 @@
125125
comment="Website Id"/>
126126
<column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
127127
comment="Customer Group ID"/>
128-
<column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="false"
128+
<column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="false"
129129
comment="Min Price"/>
130-
<column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="false"
130+
<column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="false"
131131
comment="Max Price"/>
132132
<constraint xsi:type="primary" referenceId="PRIMARY">
133133
<column name="entity_id"/>
@@ -181,21 +181,21 @@
181181
default="0" comment="Tax Class ID"/>
182182
<column xsi:type="smallint" name="price_type" padding="5" unsigned="true" nullable="false" identity="false"
183183
comment="Price Type"/>
184-
<column xsi:type="decimal" name="special_price" scale="4" precision="12" unsigned="false" nullable="true"
184+
<column xsi:type="decimal" name="special_price" scale="6" precision="20" unsigned="false" nullable="true"
185185
comment="Special Price"/>
186-
<column xsi:type="decimal" name="tier_percent" scale="4" precision="12" unsigned="false" nullable="true"
186+
<column xsi:type="decimal" name="tier_percent" scale="6" precision="20" unsigned="false" nullable="true"
187187
comment="Tier Percent"/>
188-
<column xsi:type="decimal" name="orig_price" scale="4" precision="12" unsigned="false" nullable="true"
188+
<column xsi:type="decimal" name="orig_price" scale="6" precision="20" unsigned="false" nullable="true"
189189
comment="Orig Price"/>
190-
<column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
190+
<column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
191191
comment="Price"/>
192-
<column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
192+
<column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
193193
comment="Min Price"/>
194-
<column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
194+
<column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
195195
comment="Max Price"/>
196-
<column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
196+
<column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
197197
comment="Tier Price"/>
198-
<column xsi:type="decimal" name="base_tier" scale="4" precision="12" unsigned="false" nullable="true"
198+
<column xsi:type="decimal" name="base_tier" scale="6" precision="20" unsigned="false" nullable="true"
199199
comment="Base Tier"/>
200200
<constraint xsi:type="primary" referenceId="PRIMARY">
201201
<column name="entity_id"/>
@@ -215,21 +215,21 @@
215215
default="0" comment="Tax Class ID"/>
216216
<column xsi:type="smallint" name="price_type" padding="5" unsigned="true" nullable="false" identity="false"
217217
comment="Price Type"/>
218-
<column xsi:type="decimal" name="special_price" scale="4" precision="12" unsigned="false" nullable="true"
218+
<column xsi:type="decimal" name="special_price" scale="6" precision="20" unsigned="false" nullable="true"
219219
comment="Special Price"/>
220-
<column xsi:type="decimal" name="tier_percent" scale="4" precision="12" unsigned="false" nullable="true"
220+
<column xsi:type="decimal" name="tier_percent" scale="6" precision="20" unsigned="false" nullable="true"
221221
comment="Tier Percent"/>
222-
<column xsi:type="decimal" name="orig_price" scale="4" precision="12" unsigned="false" nullable="true"
222+
<column xsi:type="decimal" name="orig_price" scale="6" precision="20" unsigned="false" nullable="true"
223223
comment="Orig Price"/>
224-
<column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
224+
<column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
225225
comment="Price"/>
226-
<column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
226+
<column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
227227
comment="Min Price"/>
228-
<column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
228+
<column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
229229
comment="Max Price"/>
230-
<column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
230+
<column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
231231
comment="Tier Price"/>
232-
<column xsi:type="decimal" name="base_tier" scale="4" precision="12" unsigned="false" nullable="true"
232+
<column xsi:type="decimal" name="base_tier" scale="6" precision="20" unsigned="false" nullable="true"
233233
comment="Base Tier"/>
234234
<constraint xsi:type="primary" referenceId="PRIMARY">
235235
<column name="entity_id"/>
@@ -253,9 +253,9 @@
253253
default="0" comment="Group Type"/>
254254
<column xsi:type="smallint" name="is_required" padding="5" unsigned="true" nullable="true" identity="false"
255255
default="0" comment="Is Required"/>
256-
<column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
256+
<column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
257257
comment="Price"/>
258-
<column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
258+
<column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
259259
comment="Tier Price"/>
260260
<constraint xsi:type="primary" referenceId="PRIMARY">
261261
<column name="entity_id"/>
@@ -281,9 +281,9 @@
281281
default="0" comment="Group Type"/>
282282
<column xsi:type="smallint" name="is_required" padding="5" unsigned="true" nullable="true" identity="false"
283283
default="0" comment="Is Required"/>
284-
<column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
284+
<column xsi:type="decimal" name="price" scale="6" precision="20" unsigned="false" nullable="true"
285285
comment="Price"/>
286-
<column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
286+
<column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
287287
comment="Tier Price"/>
288288
<constraint xsi:type="primary" referenceId="PRIMARY">
289289
<column name="entity_id"/>
@@ -303,15 +303,15 @@
303303
comment="Website ID"/>
304304
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
305305
default="0" comment="Option Id"/>
306-
<column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
306+
<column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
307307
comment="Min Price"/>
308-
<column xsi:type="decimal" name="alt_price" scale="4" precision="12" unsigned="false" nullable="true"
308+
<column xsi:type="decimal" name="alt_price" scale="6" precision="20" unsigned="false" nullable="true"
309309
comment="Alt Price"/>
310-
<column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
310+
<column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
311311
comment="Max Price"/>
312-
<column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
312+
<column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
313313
comment="Tier Price"/>
314-
<column xsi:type="decimal" name="alt_tier_price" scale="4" precision="12" unsigned="false" nullable="true"
314+
<column xsi:type="decimal" name="alt_tier_price" scale="6" precision="20" unsigned="false" nullable="true"
315315
comment="Alt Tier Price"/>
316316
<constraint xsi:type="primary" referenceId="PRIMARY">
317317
<column name="entity_id"/>
@@ -330,15 +330,15 @@
330330
comment="Website ID"/>
331331
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
332332
default="0" comment="Option Id"/>
333-
<column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
333+
<column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
334334
comment="Min Price"/>
335-
<column xsi:type="decimal" name="alt_price" scale="4" precision="12" unsigned="false" nullable="true"
335+
<column xsi:type="decimal" name="alt_price" scale="6" precision="20" unsigned="false" nullable="true"
336336
comment="Alt Price"/>
337-
<column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
337+
<column xsi:type="decimal" name="max_price" scale="6" precision="20" unsigned="false" nullable="true"
338338
comment="Max Price"/>
339-
<column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
339+
<column xsi:type="decimal" name="tier_price" scale="6" precision="20" unsigned="false" nullable="true"
340340
comment="Tier Price"/>
341-
<column xsi:type="decimal" name="alt_tier_price" scale="4" precision="12" unsigned="false" nullable="true"
341+
<column xsi:type="decimal" name="alt_tier_price" scale="6" precision="20" unsigned="false" nullable="true"
342342
comment="Alt Tier Price"/>
343343
<constraint xsi:type="primary" referenceId="PRIMARY">
344344
<column name="entity_id"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<features value="Catalog"/>
1313
<stories value="MAGETWO-51484-Input type configuration for custom Product Attributes"/>
1414
<group value="Catalog"/>
15-
<title value="Admin should be able to switch between two versions of TinyMCE"/>
16-
<description value="Admin should be able to switch between two versions of TinyMCE"/>
15+
<title value="Admin are able to change Input Type of Text Editor product attribute"/>
16+
<description value="Admin are able to change Input Type of Text Editor product attribute"/>
1717
<severity value="CRITICAL"/>
18-
<testCaseId value="MAGETWO-85745"/>
18+
<testCaseId value="MC-6215"/>
1919
</annotations>
2020
<before>
2121
<actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<title value="Admin should be able to sell products with different variants of their own"/>
1616
<description value="Admin should be able to sell products with different variants of their own"/>
1717
<severity value="CRITICAL"/>
18-
<testCaseId value="MAGETWO-58184"/>
18+
<testCaseId value="MC-16476"/>
1919
<group value="product"/>
2020
</annotations>
2121

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<annotations>
1313
<features value="Catalog"/>
1414
<stories value="Purchase a product with Custom Options of different types"/>
15-
<title value="Admin should be able to sell products with different variants of their own"/>
16-
<description value="Admin should be able to sell products with different variants of their own"/>
15+
<title value="Admin should be able to sell products with custom options of different types"/>
16+
<description value="Admin should be able to sell products with custom options of different types"/>
1717
<severity value="CRITICAL"/>
18-
<testCaseId value="MAGETWO-61717"/>
18+
<testCaseId value="MC-16462"/>
1919
<group value="Catalog"/>
2020
</annotations>
2121
<before>

‎app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,4 +393,40 @@ public function dataProviderGetSavePercent()
393393
['basePrice' => '20.80', 'tierPrice' => '18.72', 'savedPercent' => '10']
394394
];
395395
}
396+
397+
/**
398+
* @param null|string|float $quantity
399+
* @param float $expectedValue
400+
* @dataProvider getQuantityDataProvider
401+
*/
402+
public function testGetQuantity($quantity, $expectedValue)
403+
{
404+
$tierPrice = new TierPrice(
405+
$this->product,
406+
$quantity,
407+
$this->calculator,
408+
$this->priceCurrencyMock,
409+
$this->session,
410+
$this->groupManagement,
411+
$this->customerGroupRetriever
412+
);
413+
414+
$this->assertEquals($expectedValue, $tierPrice->getQuantity());
415+
}
416+
417+
/**
418+
* @return array
419+
*/
420+
public function getQuantityDataProvider()
421+
{
422+
return [
423+
[null, 1],
424+
['one', 1],
425+
['', 1],
426+
[4, 4],
427+
[4.5, 4.5],
428+
['0.7', 0.7],
429+
['0.0000000', 1]
430+
];
431+
}
396432
}

0 commit comments

Comments
 (0)