Don't call process_response() inside process_payment_with_deferred_intent() for orders that require action/confirmation (#3520)

* Don't process the latest charge if the payment requires confirmation or further actions

* Add changelog entry

* Fix 3DS tests now that get_latest_charge_from_intent() isn't run

Author: mattallan

changelog.txt

@@ -2,6 +2,7 @@
 
 = 8.8.1 - xxxx-xx-xx =
 * Tweak - Disables APMs when using the legacy checkout experience due Stripe deprecation by October 29, 2024.
+* Fix - Prevent marking orders on-hold with order note "Process order to take payment" when the payment has failed.
 
 = 8.8.0 - 2024-10-17 =
 * Fix - Update URL and path constants to support use of symlinked plugin.

includes/payment-methods/class-wc-stripe-upe-payment-gateway.php

@@ -885,7 +885,7 @@ private function process_payment_with_deferred_intent( int $order_id ) {
 				$redirect = $return_url;
 			}
 
-			if ( $payment_needed ) {
+			if ( $payment_needed && ! in_array( $payment_intent->status, [ 'requires_confirmation', 'requires_action' ], true ) ) {
 				// Use the last charge within the intent to proceed.
 				$charge = $this->get_latest_charge_from_intent( $payment_intent );
 

readme.txt

@@ -130,5 +130,6 @@ If you get stuck, you can ask for help in the Plugin Forum.
 
 = 8.8.1 - xxxx-xx-xx =
 * Tweak - Disables APMs when using the legacy checkout experience due Stripe deprecation by October 29, 2024.
+* Fix - Prevent marking orders on-hold with order note "Process order to take payment" when the payment has failed.
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).

tests/phpunit/test-class-wc-stripe-upe-payment-gateway.php

@@ -452,7 +452,7 @@ public function test_process_payment_deferred_intent_with_required_action_return
 
 		// We only use this when handling mandates.
 		$this->mock_gateway
-			->expects( $this->exactly( 2 ) )
+			->expects( $this->once() )
 			->method( 'get_latest_charge_from_intent' )
 			->willReturn( null );
 
@@ -539,7 +539,7 @@ public function test_process_payment_deferred_intent_with_required_action_for_wa
 
 		// We only use this when handling mandates.
 		$this->mock_gateway
-			->expects( $saved_token ? $this->never() : ( $free_order ? $this->once() : $this->exactly( 2 ) ) )
+			->expects( $saved_token ? $this->never() : $this->once() )
 			->method( 'get_latest_charge_from_intent' )
 			->willReturn( null );
 
@@ -1378,7 +1378,7 @@ function( $passed_order ) use ( $order ) {
 			'payment_method_details' => $payment_intent_mock,
 		];
 		$this->mock_gateway
-			->expects( $this->exactly( 2 ) )
+			->expects( $this->once() )
 			->method( 'get_latest_charge_from_intent' )
 			->willReturn( $this->array_to_object( $charge ) );
 
@@ -1387,7 +1387,7 @@ function( $passed_order ) use ( $order ) {
 		$client_secret = $payment_intent_mock->client_secret;
 
 		$this->assertEquals( 'success', $response['result'] );
-		$this->assertEquals( 'processing', $final_order->get_status() );
+		$this->assertEquals( 'pending', $final_order->get_status() ); // Order status should be pending until 3DS is completed.
 		$this->assertEquals( $payment_intent_id, $final_order->get_meta( '_stripe_intent_id', true ) );
 		$this->assertEquals( $customer_id, $final_order->get_meta( '_stripe_customer_id', true ) );
 		$this->assertEquals( $payment_method_id, $final_order->get_meta( '_stripe_source_id', true ) );