Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix error in configurables #24659

Merged
merged 3 commits into from
Oct 8, 2019
Merged

Fix error in configurables #24659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bff262d
Fix error in configurables
elfeffe Sep 19, 2019
d16dd4c
Improve code, a bit
elfeffe Sep 21, 2019
4437767
Static test fix, unit test coverage
Nazar65 Oct 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/code/Magento/ConfigurableProduct/Model/Product/Type/VariationMatrix.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

namespace Magento\ConfigurableProduct\Model\Product\Type;

/**
* Variation matrix.
*
* @api
* @since 100.0.2
*/
Expand Down Expand Up @@ -40,7 +43,9 @@ public function getVariations($usedProductAttributes)
for ($attributeIndex = $attributesCount; $attributeIndex--;) {
$currentAttribute = $variationalAttributes[$attributeIndex];
$currentVariationValue = $currentVariation[$attributeIndex];
$filledVariation[$currentAttribute['id']] = $currentAttribute['values'][$currentVariationValue];
if (!empty($currentAttribute['id'])) {
$filledVariation[$currentAttribute['id']] = $currentAttribute['values'][$currentVariationValue];
}
}

$variations[] = $filledVariation;
Expand Down
143 changes: 107 additions & 36 deletions app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/VariationMatrixTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,46 +25,117 @@ protected function setUp()
);
}

public function testGetVariations()
/**
* Variations matrix test.
*
* @param array $expectedResult
* @dataProvider variationProvider
*/
public function testGetVariations($expectedResult)
{
$result = [
[
130 => [
'value' => '3',
'label' => 'red',
'price' => ['value_index' => '3', 'pricing_value' => '', 'is_percent' => '0', 'include' => '1',],
],
],
[
130 => [
'value' => '4',
'label' => 'blue',
'price' => ['value_index' => '4', 'pricing_value' => '', 'is_percent' => '0', 'include' => '1',],
],
],
];

$input = [
130 => [
'values' => [
[
'value_index' => '3',
'pricing_value' => '',
'is_percent' => '0',
'include' => '1'
],
[
'value_index' => '4',
'pricing_value' => '',
'is_percent' => '0',
'include' => '1'
$this->assertEquals($expectedResult['result'], $this->model->getVariations($expectedResult['input']));
}

/**
* Test data provider.
*/
public function variationProvider()
{
return [
[
'with_attribute_id' => [
'result' => [
[
130 => [
'value' => '3',
'label' => 'red',
'price' => [
'value_index' => '3',
'pricing_value' => '',
'is_percent' => '0',
'include' => '1'
],
],
],
[
130 => [
'value' => '4',
'label' => 'blue',
'price' => [
'value_index' => '4',
'pricing_value' => '',
'is_percent' => '0',
'include' => '1'
],
],
],
],
'input' => [
130 => [
'values' => [
[
'value_index' => '3',
'pricing_value' => '',
'is_percent' => '0',
'include' => '1'
],
[
'value_index' => '4',
'pricing_value' => '',
'is_percent' => '0',
'include' => '1'
],
],
'attribute_id' => '130',
'options' => [
[
'value' => '3',
'label' => 'red'
],
['value' => '4',
'label' => 'blue'
]
],
],
]
],
'attribute_id' => '130',
'options' => [['value' => '3', 'label' => 'red',], ['value' => '4', 'label' => 'blue',],],
],
'without_attribute_id' => [
'result' => [
[
130 => [
'value' => '4',
'label' => 'blue',
'price' => [
'value_index' => '4',
'pricing_value' => '',
'is_percent' => '0',
'include' => '1'
],
],
],
],
'input' => [
130 => [
'values' => [
[
'value_index' => '3',
'pricing_value' => '',
'is_percent' => '0',
'include' => '1'
]
],
'attribute_id' => '',
'options' => [
[
'value' => '3',
'label' => 'red'
]
],
],
]
]
]
];

$this->assertEquals($result, $this->model->getVariations($input));
}
}