merge in most forks #167
Open
merge in most forks #167
Conversation
This file contains hidden or 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
…the price indexing error in Magento 1.7.x
… be pi.group_price
…in 1.7/1.12 and move to same location as in 1.7/1.12
…roduct/view/type/options/configurable.phtml has the attribute "size".
update overriden code to reflect changes made in parent 1.7/1.12 code
…in 1.7/1.12 and move to same location as in 1.7/1.12
…ate the display based on child product selected
Fixed an issue with the stock status js and also included the "Add to Cart" button dynamic switching. Signed-off-by: Lyndon Hook <[email protected]> Signed-off-by: Jonathan <[email protected]>
…not visible, provided the child is. Signed-off-by: Jim O'Halloran <[email protected]>
Conflicts: app/code/community/OrganicInternet/SimpleConfigurableProducts/Catalog/Model/Product/Type/Simple.php modman
(cherry picked from commit ef20da5)
Fixed modman file
Merge changes from jhuriez@7321776
Request merge for two functionality issues
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.