-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #480 from magento-fearless-kiwis/pull_request_2.0.11
Fixed issues: - MAGETWO-59102 Bundle Products - The options you selected are not available - MAGETWO-58035 [Backport] - Configurable product options not saved when editing
- Loading branch information
Showing
18 changed files
with
349 additions
and
164 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable-customer-data.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
/** | ||
* Copyright © 2016 Magento. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
|
||
require([ | ||
'jquery', | ||
'Magento_ConfigurableProduct/js/options-updater' | ||
], function ($, Updater) { | ||
'use strict'; | ||
|
||
var selectors = { | ||
formSelector: '#product_addtocart_form' | ||
}, | ||
configurableWidgetName = 'mageConfigurable', | ||
widgetInitEvent = 'configurable.initialized', | ||
|
||
/** | ||
* Sets all configurable attribute's selected values | ||
*/ | ||
updateConfigurableOptions = function () { | ||
var configurableWidget = $(selectors.formSelector).data(configurableWidgetName); | ||
|
||
if (!configurableWidget) { | ||
return; | ||
} | ||
configurableWidget.options.values = this.productOptions || {}; | ||
configurableWidget._configureForValues(); | ||
}, | ||
updater = new Updater(widgetInitEvent, updateConfigurableOptions); | ||
|
||
updater.listen(); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.