Skip to content

Fixed magento text swatch switches product image even if attribute feature is disabled #16446 #19184

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

Merged
merged 4 commits into from
Jun 7, 2019
Merged

Fixed magento text swatch switches product image even if attribute feature is disabled #16446 #19184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfaee8e
Fixed magento text swatch switches product image even if attribute fe…
ravi-chandra3197 Apr 25, 2019
6ce2026
magento/magento2#19184: Static test fix.
p-bystritsky Apr 26, 2019
01e8ff1
magento/magento2#19184: MFTF test fix
p-bystritsky Apr 26, 2019
73ef119
magento/magento2#19184: Static test fix.
p-bystritsky Apr 30, 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
1 change: 1 addition & 0 deletions app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<element name="DefaultLabel" type="input" selector="#attribute_label"/>
<element name="InputType" type="select" selector="#frontend_input"/>
<element name="ValueRequired" type="select" selector="#is_required"/>
<element name="UpdateProductPreviewImage" type="select" selector="[name='update_product_preview_image']"/>
<element name="AdvancedProperties" type="button" selector="#advanced_fieldset-wrapper"/>
<element name="DefaultValue" type="input" selector="#default_value_text"/>
<element name="Scope" type="select" selector="#is_global"/>
Expand Down
18 changes: 17 additions & 1 deletion app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,17 @@ public function getJsonSwatchConfig()
$attributeDataArray
);
}
if (isset($attributeDataArray['additional_data'])) {
$config[$attributeId]['additional_data'] = $attributeDataArray['additional_data'];
}
}

return $this->jsonEncoder->encode($config);
}

/**
* Get number of swatches from config to show on product listing.
*
* Other swatches can be shown after click button 'Show more'
*
* @return string
Expand Down Expand Up @@ -228,6 +232,8 @@ public function getProduct()
}

/**
* Get swatch attributes data.
*
* @return array
*/
protected function getSwatchAttributesData()
Expand All @@ -236,6 +242,8 @@ protected function getSwatchAttributesData()
}

/**
* Init isProductHasSwatchAttribute.
*
* @deprecated 100.1.5 Method isProductHasSwatchAttribute() is used instead of this.
*
* @codeCoverageIgnore
Expand Down Expand Up @@ -364,6 +372,8 @@ protected function getVariationMedia($attributeCode, $optionId)
}

/**
* Get swatch product image.
*
* @param Product $childProduct
* @param string $imageType
* @return string
Expand All @@ -384,6 +394,8 @@ protected function getSwatchProductImage(Product $childProduct, $imageType)
}

/**
* Check if product have image.
*
* @param Product $product
* @param string $imageType
* @return bool
Expand All @@ -394,6 +406,8 @@ protected function isProductHasImage(Product $product, $imageType)
}

/**
* Get configurable options ids.
*
* @param array $attributeData
* @return array
* @since 100.0.3
Expand Down Expand Up @@ -453,15 +467,17 @@ protected function getRendererTemplate()
}

/**
* @inheritDoc
* @deprecated 100.1.5 Now is used _toHtml() directly
* @return string
*/
protected function getHtmlOutput()
{
return parent::_toHtml();
}

/**
* Get media callback url.
*
* @return string
*/
public function getMediaCallback()
Expand Down
3 changes: 3 additions & 0 deletions app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
<!-- Select visual swatch -->
<selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="swatch_visual" stepKey="selectInputType"/>

<!-- Set Update Product Preview Image to Yes-->
<selectOption selector="{{AttributePropertiesSection.UpdateProductPreviewImage}}" userInput="Yes" stepKey="setUpdateProductPreviewImage"/>

<!-- This hack is because the same <input type="file"> is re-purposed used for all uploads. -->
<executeJS function="HTMLInputElement.prototype.click = function() { if(this.type !== 'file') HTMLElement.prototype.click.call(this); };" stepKey="disableClick"/>

Expand Down
8 changes: 6 additions & 2 deletions app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,8 @@ define([
$wrapper = $this.parents('.' + $widget.options.classes.attributeOptionsWrapper),
$label = $parent.find('.' + $widget.options.classes.attributeSelectedOptionLabelClass),
attributeId = $parent.attr('attribute-id'),
$input = $parent.find('.' + $widget.options.classes.attributeInput);
$input = $parent.find('.' + $widget.options.classes.attributeInput),
checkAdditionalData = JSON.parse(this.options.jsonSwatchConfig[attributeId]['additional_data']);

if ($widget.inProductList) {
$input = $widget.productForm.find(
Expand Down Expand Up @@ -753,7 +754,10 @@ define([
$widget.options.jsonConfig.optionPrices
]);

$widget._loadMedia();
if (checkAdditionalData['update_product_preview_image'] === '1') {
$widget._loadMedia();
}

$input.trigger('change');
},

Expand Down