Skip to content

Use existing helper method for payment method detachment checks in token code #4812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 20, 2025
+4 −12
Merged

Use existing helper method for payment method detachment checks in token code #4812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7e29e7d
Use central method for payment detachment checks in payment tokens code
daledupreez Nov 18, 2025
7dfb167
Changelog
daledupreez Nov 18, 2025
8e53062
Merge branch 'develop' into refactor/use-common-method-for-payment-me…
daledupreez Nov 18, 2025
5c56848
Improve changelog entry
daledupreez Nov 18, 2025
a34542e
Merge branch 'develop' into refactor/use-common-method-for-payment-me…
daledupreez Nov 18, 2025
2f5e68d
Merge branch 'develop' into refactor/use-common-method-for-payment-me…
daledupreez Nov 19, 2025
8ab04b5
Merge branch 'develop' into refactor/use-common-method-for-payment-me…
daledupreez Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
* Fix - Don't allow WP-Cron jobs to detach payment methods on staging sites
* Update - Add minimum transaction amounts for BRL, INR, NZD, THB, CZK, HUF, AED, MYR, PLN, RON
* Dev - Add additional context data to the OAuth connect flow verbose debug logging mode
* Fix - Make token detachment checks use shared logic for detaching payment methods

= 10.1.0 - 2025-11-11 =
* Dev - Remove unused `shouldShowPaymentRequestButton` parameter and calculations from backend
Expand Down
14 changes: 2 additions & 12 deletions includes/payment-tokens/class-wc-stripe-payment-tokens.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,18 +480,8 @@ public function woocommerce_payment_token_deleted( $token_id, $token ) {
return;
}

/**
* 1. Check if it's live mode.
* 2. Check if it's admin.
* 3. Check if it's not production environment.
* When all conditions are met, we don't want to delete the payment method from Stripe.
* This is to avoid detaching the payment method from the live stripe account on non production environments.
*/
if (
WC_Stripe_Mode::is_live() &&
is_admin() &&
'production' !== wp_get_environment_type()
) {
// Check if we should detach the payment method from the customer.
if ( ! WC_Stripe_API::should_detach_payment_method_from_customer() ) {
Comment on lines +483 to +484
Copy link

Copilot AI Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The helper method should_detach_payment_method_from_customer() includes an additional check for WooCommerce Subscriptions staging mode (is_woocommerce_subscriptions_staging_mode()) that was not present in the original inline logic. This means the behavior will change: payment methods will now also NOT be detached when WooCommerce Subscriptions staging mode is enabled, even if the site is identified as production by wp_get_environment_type(). While this may be intentional for better safety, it represents a behavioral change that should be acknowledged and tested.

Suggested change
// Check if we should detach the payment method from the customer.
if ( ! WC_Stripe_API::should_detach_payment_method_from_customer() ) {
// Only detach payment methods in production environment.
if ( 'production' !== wp_get_environment_type() ) {

Copilot uses AI. Check for mistakes.
return;
}

Expand Down
1 change: 1 addition & 0 deletions readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,5 +128,6 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
* Fix - Don't allow WP-Cron jobs to detach payment methods on staging sites
* Update - Add minimum transaction amounts for BRL, INR, NZD, THB, CZK, HUF, AED, MYR, PLN, RON
* Dev - Add additional context data to the OAuth connect flow verbose debug logging mode
* Fix - Make token detachment checks use shared logic for detaching payment methods

[See changelog for full details across versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).
Loading