Fix setting the wallet's default payment source to the same value #1888
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
houndci-bot
reviewed
May 5, 2017
| @@ -95,6 +95,19 @@ | |||
| end | |||
| end | |||
|
|
|||
| context "with the same payment source already set to default" do | |||
| let!(:wallet_credit_card) { subject.add(credit_card) } | |||
|
|
|||
core/app/models/spree/wallet.rb
Outdated
| @@ -61,6 +61,11 @@ def default_wallet_payment_source=(wallet_payment_source) | |||
| raise Unauthorized, "wallet_payment_source #{wallet_payment_source.id} does not belong to wallet of user #{user.id}" | |||
| end | |||
|
|
|||
| # Do not update the payment source if the passed source is already default | |||
| if(default_wallet_payment_source.try(:id) == wallet_payment_source.id) | |||
…set to the same value This fixes a bug where if the app tried to set the default payment method to the existing default, the wallet would end up with no default payment method
mamhoff
reviewed
May 8, 2017
core/app/models/spree/wallet.rb
Outdated
| @@ -61,6 +61,11 @@ def default_wallet_payment_source=(wallet_payment_source) | |||
| raise Unauthorized, "wallet_payment_source #{wallet_payment_source.id} does not belong to wallet of user #{user.id}" | |||
| end | |||
|
|
|||
| # Do not update the payment source if the passed source is already default | |||
| if default_wallet_payment_source.try(:id) == wallet_payment_source.try(:id) | |||
There was a problem hiding this comment.
What happens if both of these return nil?
There was a problem hiding this comment.
It's probably better to also not use .try(:id). default_wallet_payment_source == wallet_payment_source
There was a problem hiding this comment.
If both return nil, it should signify that the system is trying to clear the default payment source (wallet_payment_source=>nil) and that the default payment source is already not set (default_wallet_payment_source=>nil). Since we just return for this case, nothing would change, which I would think is what would be wanted.
There was a problem hiding this comment.
@jhawthorn, made the change to not compare against the ids.
jhawthorn
approved these changes
May 8, 2017
jhawthorn
changed the title
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.
…set to the same value
This fixes a bug where if the app tried to set the default payment method to the existing default, the wallet would end up with no default payment method