Fixing and simplifying payment tokens comparison #4667
Merged
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
6 tasks
wjrosa
changed the title
wjrosa
commented
Sep 15, 2025
| $gateway_id = $this->is_oc_enabled() ? 'stripe' : $this->id; | ||
|
|
||
| $token->set_gateway_id( $gateway_id ); | ||
| $token->set_gateway_id( WC_Stripe_Payment_Tokens::UPE_REUSABLE_GATEWAYS_BY_PAYMENT_METHOD[ self::STRIPE_ID ] ); |
There was a problem hiding this comment.
That's the first fix here.
wjrosa
commented
Sep 15, 2025
| if ( WC_Stripe_Payment_Methods::CASHAPP_PAY === $this->get_type() | ||
| && ( $payment_method->cashapp->cashtag ?? null ) === $this->get_cashtag() ) { | ||
| return true; | ||
| if ( WC_Stripe_Payment_Methods::CASHAPP_PAY !== $payment_method->type ) { |
There was a problem hiding this comment.
And that's the second fix.
wjrosa
requested review from
a team,
annemirasol and
Mayisha
and removed request for
a team
daledupreez
reviewed
Sep 16, 2025
includes/payment-tokens/class-wc-stripe-becs-debit-payment-token.php
Outdated
Show resolved
Hide resolved
Co-authored-by: daledupreez <[email protected]>
…en.php Co-authored-by: daledupreez <[email protected]>
annemirasol
approved these changes
Sep 16, 2025
daledupreez
approved these changes
Sep 17, 2025
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.
Inspired by #4658 (comment)
Changes proposed in this Pull Request:
In this PR, I am simplifying the logic we have today to compare new payment method tokens with existing ones. I am also fixing comparisons for the CashApp Pay tokens and the value it sets for the gateway ID.
The CashApp Pay token comparison was checking the
typeproperty against itself. The Gateway ID parameter was being set with the wrong values.Testing instructions
-- Confirm you can complete a purchase and save it for later use
-- Add it as a saved payment method using the My Account screen
Changelog entry
Changelog Entry Comment
Comment
Post merge