Checking for the subscription detached payment method (#4565)

* Checking for the subscription detached payment method

* Changelog and readme entries

* Unit tests

* Fix tests

* Fix tests

* Fix tests

Author: wjrosa

changelog.txt

@@ -1,6 +1,7 @@
 *** Changelog ***
 
 = 9.8.0 - xxxx-xx-xx =
+* Fix - Checks for the subscription payment method (if it is Stripe) when verifying for the payment method detachment
 * Update - Removes the ability to change the title for the Optimized Checkout payment element, as it is now set to "Stripe" by default
 * Update - Copy for the Optimized Checkout settings and notices
 * Dev - Implements WooCommerce constants for the tax statuses

includes/compat/class-wc-stripe-subscriptions-helper.php

@@ -151,6 +151,11 @@ public static function is_subscription_payment_method_detached( $subscription )
 			return false;
 		}
 
+		if ( 'stripe' !== substr( (string) $subscription->get_payment_method(), 0, 6 ) ) {
+			// If the payment method is not a Stripe method, we don't need to check further.
+			return false;
+		}
+
 		$source_id = $subscription->get_meta( '_stripe_source_id' );
 		if ( ! $source_id ) {
 			return false;

readme.txt

@@ -111,6 +111,7 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 == Changelog ==
 
 = 9.8.0 - xxxx-xx-xx =
+* Fix - Checks for the subscription payment method (if it is Stripe) when verifying for the payment method detachment
 * Update - Removes the ability to change the title for the Optimized Checkout payment element, as it is now set to "Stripe" by default
 * Update - Copy for the Optimized Checkout settings and notices
 * Dev - Implements WooCommerce constants for the tax statuses

tests/phpunit/Admin/WC_Stripe_Admin_Notices_Test.php

@@ -646,6 +646,7 @@ public function provide_test_subscription_check_detachment() {
 		$subscription = new WC_Subscription();
 		$subscription->set_id( 123 );
 		$subscription->set_status( 'active' );
+		$subscription->set_payment_method( 'stripe_klarna' );
 		$subscription->save();
 
 		$subscription->update_meta_data( '_stripe_source_id', $source_id );

tests/phpunit/Admin/WC_Stripe_Subscription_Detached_Bulk_Action_Test.php

@@ -80,6 +80,7 @@ public function provide_test_handle_subscription_detachment_check() {
 		$source_id             = 'src_123';
 		$subscription_detached = new WC_Subscription();
 		$subscription_detached->set_id( 2 );
+		$subscription_detached->set_payment_method( 'stripe_klarna' );
 		$subscription_detached->update_meta_data( '_stripe_source_id', $source_id );
 
 		$payment_method = (object) [

tests/phpunit/Compat/WC_Stripe_Subscriptions_Helper_Test.php

@@ -60,6 +60,7 @@ public function test_get_detached_subscriptions() {
 		$subscription = new WC_Subscription();
 		$subscription->set_id( $subscription_id );
 		$subscription->set_status( 'active' );
+		$subscription->set_payment_method( 'stripe_klarna' );
 		$subscription->set_time( 'next_payment_date', strtotime( '+1 week' ) );
 		$subscription->save();
 
@@ -178,19 +179,21 @@ public function provide_test_build_subscriptions_detached_messages() {
 	/**
 	 * Tests for {@see WC_Stripe_Subscriptions_Helper::is_subscription_payment_method_detached()}.
 	 *
+	 * @param string $payment_method The payment method type for the subscription.
 	 * @param array|null $source_meta The source meta data for the subscription.
 	 * @param array|\WP_Error $mocked_response The mocked response from the Stripe API.
 	 * @param bool $expected The expected result of the check.
 	 * @return void
 	 *
 	 * @dataProvider provide_test_is_subscription_payment_method_detached
 	 */
-	public function test_is_subscription_payment_method_detached( $source_meta, $mocked_response, $expected ) {
+	public function test_is_subscription_payment_method_detached( $payment_method, $source_meta, $mocked_response, $expected ) {
 		WC_Stripe_Database_Cache::delete( 'payment_method_for_source_' . $source_meta );
 
 		$subscription = new WC_Subscription();
 		$subscription->set_id( 1 );
 		$subscription->set_status( 'active' );
+		$subscription->set_payment_method( $payment_method );
 		$subscription->save();
 
 		if ( ! is_null( $source_meta ) ) {
@@ -223,17 +226,26 @@ public function test_is_subscription_payment_method_detached( $source_meta, $moc
 	 */
 	public function provide_test_is_subscription_payment_method_detached() {
 		return [
+			'not a Stripe subscription'               => [
+				'payment method' => 'not_stripe',
+				'source meta'     => null,
+				'mocked response' => null,
+				'expected'        => false,
+			],
 			'missing meta'                            => [
+				'payment method'  => 'stripe_klarna',
 				'source meta'     => null,
 				'mocked response' => null,
 				'expected'        => false,
 			],
 			'wp error response, assumed detached'     => [
+				'payment method'  => 'stripe_klarna',
 				'source meta'     => 'src_123',
 				'mocked response' => new \WP_Error( 'error', 'An error occurred.' ),
 				'expected'        => true,
 			],
 			'Stripe error response, assumed detached' => [
+				'payment method'  => 'stripe_klarna',
 				'source meta'     => 'src_123',
 				'mocked response' => [
 					'response' => 400,
@@ -250,6 +262,7 @@ public function provide_test_is_subscription_payment_method_detached() {
 				'expected'        => true,
 			],
 			'existing customer data'                  => [
+				'payment method'  => 'stripe_klarna',
 				'source meta'     => 'src_123',
 				'mocked response' => [
 					'response' => 200,
@@ -263,6 +276,7 @@ public function provide_test_is_subscription_payment_method_detached() {
 				'expected'        => false,
 			],
 			'detached payment method'                 => [
+				'payment method'  => 'stripe_klarna',
 				'source meta'     => 'src_123',
 				'mocked response' => [
 					'response' => 200,

tests/phpunit/WC_Stripe_Status_Test.php

@@ -115,6 +115,7 @@ public function test_list_detached_subscriptions( $subscriptions, $expected_outp
 				$subscription = new WC_Subscription();
 				$subscription->set_id( $subscription_data['id'] );
 				$subscription->set_status( 'active' );
+				$subscription->set_payment_method( 'stripe_klarna' );
 				$subscription->save();
 
 				$subscription->update_meta_data( '_stripe_customer_id', $subscription_data['customer_id'] );