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

Jump to bottom

Fixed swatches not rendering properly at product detail page #3206

Merged
merged 7 commits into from
Jul 13, 2019
Merged

Fixed swatches not rendering properly at product detail page #3206

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0815aea
Fixed swatches not rendering properly at product detail page
vishal-7037 Jul 10, 2019
58e3178
Updated changelog
vishal-7037 Jul 10, 2019
29331c3
Updated suggested changes
vishal-7037 Jul 10, 2019
20d429e
Added condition for undefined
vishal-7037 Jul 10, 2019
441e7dc
Updated suggested changes
vishal-7037 Jul 10, 2019
8fcb17e
Merge branch 'develop' into bugfix/product-details-page-swatches-issue
pkarw Jul 11, 2019
4560e9a
Merge branch 'develop' into bugfix/product-details-page-swatches-issue
pkarw Jul 13, 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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Make image proxy url work with relative base url - @cewald (#3158)
- Fixed memory leak with enabled dynamicConfigReload - @dimasch (#3075)
- Fixed error for the orderhistory null for google-tag-manager extension - @cnviradiya (#3195)
- Fixed swatches not rendering properly at product detail page issue - @vishal-7037 (#3206)

### Changed / Improved
- Shipping address is saved as default when not logged in user chooses to create account during checkout - @iwonapiotrowska (#2636)
Expand Down
2 changes: 2 additions & 0 deletions src/themes/default/pages/Product.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,8 @@ export default {
this.product.configurable_options.forEach(configurableOption => {
const type = configurableOption.attribute_code
const filterVariants = configurableOption.values.map(({value_index, label}) => {
let currentVariant = this.options[type].find(config => config.id === value_index)
label = label || (currentVariant ? currentVariant.label : value_index)
return {id: value_index, label, type}
})
filtersMap[type] = filterVariants
Expand Down