Skip to content

Commit 620b519

Browse files
aohorodnykaohorodnyk
committed
Merge remote-tracking branch 'remotes/origin/MAGETWO-44774' into BugFestW5
2 parents 7438472 + 16c3fae commit 620b519

File tree

8 files changed

+73
-4
lines changed

8 files changed

+73
-4
lines changed

‎app/code/Magento/ConfigurableProduct/Setup/InstallData.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
4747
'minimal_price',
4848
'msrp',
4949
'msrp_display_actual_price_type',
50+
'price',
5051
'special_price',
5152
'special_from_date',
5253
'special_to_date',

‎app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ define([
159159
this.attributes(attributes);
160160
this.initImageUpload();
161161
this.disableConfigurableAttributes(attributes);
162+
this.showPrice();
162163
},
163164
changeButtonWizard: function () {
164165
var $button = $('[data-action=open-steps-wizard] [data-role=button-label]');
@@ -212,6 +213,7 @@ define([
212213
$('[data-attribute-code="' + attribute.code + '"] select').removeProp('disabled');
213214
});
214215
}
216+
this.showPrice();
215217
},
216218
toggleProduct: function (rowIndex) {
217219
var product, row, productChanged = {};
@@ -369,6 +371,14 @@ define([
369371
.prop('disabled', true);
370372
});
371373
},
374+
showPrice: function () {
375+
var priceContainer = $('[id="attribute-price-container"]');
376+
if (this.productMatrix().length !== 0) {
377+
priceContainer.hide();
378+
} else {
379+
priceContainer.show();
380+
}
381+
},
372382

373383
/**
374384
* Get currency symbol

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@ class AssertProductInGrid extends AbstractConstraint
2626
* Assert that product is present in products grid and can be found by sku, type, status and attribute set.
2727
*
2828
* @param FixtureInterface $product
29-
* @param CatalogProductIndex $productGrid
29+
* @param CatalogProductIndex $productIndex
3030
* @return void
3131
*/
32-
public function processAssert(FixtureInterface $product, CatalogProductIndex $productGrid)
32+
public function processAssert(FixtureInterface $product, CatalogProductIndex $productIndex)
3333
{
3434
$this->product = $product;
35-
$productGrid->open();
35+
$productIndex->open();
36+
$productIndex->getProductGrid()->resetFilter();
3637
\PHPUnit_Framework_Assert::assertTrue(
37-
$productGrid->getProductGrid()->isRowVisible($this->prepareFilter()),
38+
$productIndex->getProductGrid()->isRowVisible($this->prepareFilter()),
3839
'Product \'' . $this->product->getName() . '\' is absent in Products grid.'
3940
);
4041
}

‎dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public function processAssert(
2828
CatalogProductIndex $productGrid,
2929
CatalogProductEdit $productPage
3030
) {
31+
$product = $this->processFixture($product);
3132
$duplicateProductSku = $product->getSku() . '-1';
3233
$filter = ['sku' => $duplicateProductSku];
3334
$productGrid->open();

‎dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductForm.php

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
namespace Magento\ConfigurableProduct\Test\Constraint;
88

99
use Magento\Catalog\Test\Constraint\AssertProductForm;
10+
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
11+
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
12+
use Magento\Mtf\Fixture\FixtureInterface;
1013

1114
/**
1215
* Class AssertConfigurableProductForm
@@ -23,6 +26,7 @@ class AssertConfigurableProductForm extends AssertProductForm
2326
'id',
2427
'affected_attribute_set',
2528
'checkout_data',
29+
'price'
2630
];
2731

2832
/**
@@ -118,4 +122,39 @@ protected function trimCurrencyForPriceInMatrix($variationsMatrix, $currency = '
118122
}
119123
return $variationsMatrix;
120124
}
125+
126+
/**
127+
* Assert form data equals product configurable data.
128+
*
129+
* @param FixtureInterface $product
130+
* @param CatalogProductIndex $productGrid
131+
* @param CatalogProductEdit $productPage
132+
* @return void
133+
*/
134+
public function processAssert(
135+
FixtureInterface $product,
136+
CatalogProductIndex $productGrid,
137+
CatalogProductEdit $productPage
138+
) {
139+
$product = $this->processFixture($product);
140+
parent::processAssert($product, $productGrid, $productPage);
141+
}
142+
143+
/**
144+
* Remove price field from fixture as it should not be retrieved from product page
145+
*
146+
* @param FixtureInterface $product
147+
* @return mixed
148+
*/
149+
protected function processFixture(FixtureInterface $product)
150+
{
151+
$data = $product->getData();
152+
if (isset($data['price'])) {
153+
unset($data['price']);
154+
}
155+
return $this->objectManager->create(
156+
'Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct',
157+
['data' => $data]
158+
);
159+
}
121160
}

‎dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<field name="name" xsi:type="string">Test configurable product %isolation%</field>
1212
<field name="sku" xsi:type="string">sku_test_configurable_product_%isolation%</field>
1313
<field name="price" xsi:type="array">
14+
<item name="value" xsi:type="string">40</item>
1415
<item name="dataset" xsi:type="string">price_40</item>
1516
</field>
1617
<field name="product_has_weight" xsi:type="string">Yes</field>
@@ -42,6 +43,7 @@
4243
<field name="name" xsi:type="string">Test configurable product %isolation%</field>
4344
<field name="sku" xsi:type="string">sku_test_configurable_product_%isolation%</field>
4445
<field name="price" xsi:type="array">
46+
<item name="value" xsi:type="string">40</item>
4547
<item name="dataset" xsi:type="string">price_40</item>
4648
</field>
4749
<field name="product_has_weight" xsi:type="string">Yes</field>
@@ -182,6 +184,10 @@
182184
<dataset name="not_virtual_for_type_switching">
183185
<field name="name" xsi:type="string">Test configurable product %isolation%</field>
184186
<field name="sku" xsi:type="string">sku_test_configurable_product_%isolation%</field>
187+
<field name="price" xsi:type="array">
188+
<item name="value" xsi:type="string">40</item>
189+
<item name="dataset" xsi:type="string">price_40</item>
190+
</field>
185191
<field name="product_has_weight" xsi:type="string">Yes</field>
186192
<field name="weight" xsi:type="string">30</field>
187193
<field name="status" xsi:type="string">Product online</field>

‎dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_options</data>
1515
<data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
1616
<data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
17+
<data name="product/data/price/value" xsi:type="string">100</data>
1718
<data name="product/data/price/dataset" xsi:type="string">default</data>
1819
<data name="product/data/category_ids/dataset" xsi:type="string">default_subcategory</data>
1920
<data name="product/data/short_description" xsi:type="string">Configurable short description</data>
@@ -38,6 +39,7 @@
3839
<data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_options</data>
3940
<data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
4041
<data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
42+
<data name="product/data/price/value" xsi:type="string">100</data>
4143
<data name="product/data/price/dataset" xsi:type="string">default</data>
4244
<data name="product/data/short_description" xsi:type="string">Configurable short description</data>
4345
<data name="product/data/description" xsi:type="string">Configurable Product description %isolation%</data>
@@ -59,6 +61,7 @@
5961
<data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_new_options_with_special_price</data>
6062
<data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
6163
<data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
64+
<data name="product/data/price/value" xsi:type="string">100</data>
6265
<data name="product/data/special_price" xsi:type="string">10</data>
6366
<data name="product/data/short_description" xsi:type="string">Configurable short description</data>
6467
<data name="product/data/description" xsi:type="string">Configurable Product description %isolation%</data>
@@ -81,6 +84,7 @@
8184
<data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_options_with_assigned_product</data>
8285
<data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
8386
<data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
87+
<data name="product/data/price/value" xsi:type="string">100</data>
8488
<data name="product/data/price/dataset" xsi:type="string">default</data>
8589
<data name="product/data/short_description" xsi:type="string">Configurable short description</data>
8690
<data name="product/data/description" xsi:type="string">Configurable Product description %isolation%</data>
@@ -100,6 +104,7 @@
100104
<data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
101105
<data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
102106
<data name="product/data/tax_class_id" xsi:type="string">Taxable Goods</data>
107+
<data name="product/data/price/value" xsi:type="string">100</data>
103108
<data name="product/data/price/dataset" xsi:type="string">MAGETWO-12620</data>
104109
<data name="product/data/category_ids/dataset" xsi:type="string">default_subcategory</data>
105110
<data name="product/data/weight" xsi:type="string">1</data>
@@ -113,6 +118,7 @@
113118
<data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_searchable_options</data>
114119
<data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
115120
<data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
121+
<data name="product/data/price/value" xsi:type="string">100</data>
116122
<data name="product/data/price/dataset" xsi:type="string">default</data>
117123
<data name="product/data/category_ids/new_category" xsi:type="string">no</data>
118124
<data name="product/data/category_ids/dataset" xsi:type="string">default_subcategory</data>

‎dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<data name="updatedProduct/data/checkout_data/cartItem/price" xsi:type="string">153</data>
1818
<data name="updatedProduct/data/name" xsi:type="string">Configurable Product %isolation%</data>
1919
<data name="updatedProduct/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
20+
<data name="updatedProduct/data/price/value" xsi:type="string">99</data>
2021
<data name="updatedProduct/data/category_ids/dataset" xsi:type="string">default_subcategory</data>
2122
<data name="updatedProduct/data/short_description" xsi:type="string">Configurable short description</data>
2223
<data name="updatedProduct/data/description" xsi:type="string">Configurable Product description %isolation%</data>
@@ -41,6 +42,7 @@
4142
<data name="updatedProduct/data/checkout_data/cartItem/price" xsi:type="string">154</data>
4243
<data name="updatedProduct/data/name" xsi:type="string">Configurable Product %isolation%</data>
4344
<data name="updatedProduct/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
45+
<data name="updatedProduct/data/price/value" xsi:type="string">99</data>
4446
<data name="updatedProduct/data/short_description" xsi:type="string">Configurable short description</data>
4547
<data name="updatedProduct/data/description" xsi:type="string">Configurable Product description %isolation%</data>
4648
<data name="updatedProduct/data/weight" xsi:type="string">3</data>
@@ -63,6 +65,7 @@
6365
<data name="updatedProduct/data/checkout_data/cartItem/price" xsi:type="string">112</data>
6466
<data name="updatedProduct/data/name" xsi:type="string">Configurable Product %isolation%</data>
6567
<data name="updatedProduct/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
68+
<data name="updatedProduct/data/price/value" xsi:type="string">99</data>
6669
<data name="updatedProduct/data/category_ids/dataset" xsi:type="string">default_subcategory</data>
6770
<data name="updatedProduct/data/short_description" xsi:type="string">Configurable short description</data>
6871
<data name="updatedProduct/data/description" xsi:type="string">Configurable Product description %isolation%</data>
@@ -85,6 +88,7 @@
8588
<data name="updatedProduct/data/checkout_data/dataset" xsi:type="string">configurable_two_attributes</data>
8689
<data name="updatedProduct/data/name" xsi:type="string">Configurable Product %isolation%</data>
8790
<data name="updatedProduct/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
91+
<data name="updatedProduct/data/price/value" xsi:type="string">99</data>
8892
<data name="updatedProduct/data/short_description" xsi:type="string">Configurable short description</data>
8993
<data name="updatedProduct/data/description" xsi:type="string">Configurable Product description %isolation%</data>
9094
<data name="updatedProduct/data/weight" xsi:type="string">3</data>
@@ -102,6 +106,7 @@
102106
<data name="updatedProduct/data/configurable_attributes_data/dataset" xsi:type="string">one_new_options</data>
103107
<data name="updatedProduct/data/name" xsi:type="string">Configurable Product %isolation%</data>
104108
<data name="updatedProduct/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
109+
<data name="updatedProduct/data/price/value" xsi:type="string">99</data>
105110
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
106111
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductPage" />
107112
</variation>

0 commit comments

Comments
 (0)