Fix duplicate variants on product page #2630
Merged
Conversation
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
|
I made a similar fix to Product#with_master_price by |
mamhoff
force-pushed
the
fix-duplicate-variants
branch
from
4213e69 to
dd4ad1b
Compare
houndci-bot
reviewed
Mar 16, 2018
core/app/models/spree/variant.rb
Outdated
| @@ -138,11 +138,21 @@ def self.active(currency = nil) | |||
| end | |||
|
|
|||
| # Returns variants that have a price for the given pricing options | |||
| # If you have modified the pricing options class, you might want to modify this scope too. | |||
mamhoff
force-pushed
the
fix-duplicate-variants
branch
2 times, most recently
from
8ad7711 to
23d5c76
Compare
This fixes issue solidusio#1654. The default pricing options class has a `search_arguments` which adds `nil` as a matching possibility for the price's country field (in order to accomodate for the fallback price). In Spree::Variant.with_prices, Spree::Price.where(search_arguments) is merged into a Variant query. This results in duplicate variants being returned. From the standard product page, `Spree::Variant.with_prices` is called by `Spree::Product#variants_and_option_values_for(current_pricing_options)`. This replaces the 'merge' call in Spree::Variant.with_prices with an SQL EXISTS subquery. There are quirks with ActiveRecord here: `.where(pricing_options.search_arguments)` - which translates to `.where(currency: "EUR", country_iso: ["FR", nil])` and does pretty much the same as the expression in this commit. However, that one just simply does not work in this context, which is why I took the decision to write the SQL by hand.
mamhoff
force-pushed
the
fix-duplicate-variants
branch
from
23d5c76 to
409c68f
Compare
|
Thank you John, good tip! Weirdly though, in this particular context ActiveRecord seems to have difficulty generating the correct SQL for the pricing options' search arguments, so I had to write some SQL by hand to make it work. This means that if a store overrides their pricing options class they might have to override the |
|
I think as long as it works under both MySQL and Postgres (and it seems to), the raw SQL is fine. |
jhawthorn
approved these changes
Mar 16, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This fixes issue #1654. The default pricing options class has a
search_argumentswhich addsnilas a matching possibility for theprice's country field (in order to accomodate for the fallback price).
In Spree::Variant.with_prices, Spree::Price.where(search_arguments) is
merged into a Variant query. This results in duplicate variants being
returned.
From the standard product page,
Spree::Variant.with_pricesis calledby
Spree::Product#variants_and_option_values_for(current_pricing_options).