Blocking disabling of cards when OC is enabled (#4540)

* Blocking disabling of cards when OC is enabled

* Changelog and readme entries

* Refactor logic to force enablement during init

* Unit tests

* Fix tests

* Removing unnecessary import

Author: wjrosa

changelog.txt

@@ -1,6 +1,7 @@
 *** Changelog ***
 
 = 9.8.0 - xxxx-xx-xx =
+* Fix - Force the card payment method to be enabled when the Optimized Checkout is enabled in the merchant's Payment Method Configuration
 * Update - Deactivates Affirm or Klarna when other official plugins are active in merchant's Payment Method Configuration
 * Fix - Fixes issues related to booking multiple slots with express checkout payment methods enabled
 * Fix - Update the Optimized Checkout promotional inbox note to link to the relevant section in the Stripe settings page

includes/class-wc-stripe.php

@@ -282,9 +282,10 @@ public function init() {
 
 		add_action( 'init', [ $this, 'initialize_apple_pay_registration' ] );
 
-		// Check for payment methods that should be deactivated, e.g. unreleased,
-		// BNPLs when official plugins are active, etc.
-		add_action( 'init', [ $this, 'maybe_deactivate_payment_methods' ] );
+		// Check for payment methods that should be toggled, e.g. unreleased,
+		// BNPLs when official plugins are active,
+		// cards when the Optimized Checkout is enabled, etc.
+		add_action( 'init', [ $this, 'maybe_toggle_payment_methods' ] );
 	}
 
 	/**
@@ -863,18 +864,20 @@ public function initialize_status_page() {
 	}
 
 	/**
-	 * Deactivate payment methods that should be deactivated, e.g. unreleased,
-	 * BNPLs when other official plugins are active, etc.
+	 * Toggle payment methods that should be enabled/disabled, e.g. unreleased,
+	 * BNPLs when other official plugins are active,
+	 * cards when the Optimized Checkout is enabled, etc.
 	 *
 	 * @return void
 	 */
-	public function maybe_deactivate_payment_methods() {
+	public function maybe_toggle_payment_methods() {
 		$gateway = $this->get_main_stripe_gateway();
 		if ( ! is_a( $gateway, 'WC_Stripe_UPE_Payment_Gateway' ) ) {
 			return;
 		}
 
 		$payment_method_ids_to_disable = [];
+		$payment_method_ids_to_enable  = [];
 		$enabled_payment_methods       = $gateway->get_upe_enabled_payment_method_ids();
 
 		// Check for BNPLs that should be deactivated.
@@ -889,10 +892,22 @@ public function maybe_deactivate_payment_methods() {
 			$this->maybe_deactivate_amazon_pay( $enabled_payment_methods )
 		);
 
-		if ( [] === $payment_method_ids_to_disable ) {
+		// Check if cards should be activated.
+		// TODO: Remove this once card is not a requirement for the Optimized Checkout.
+		if ( $gateway->is_oc_enabled()
+			&& ! in_array( WC_Stripe_Payment_Methods::CARD, $enabled_payment_methods, true ) ) {
+			$payment_method_ids_to_enable[] = WC_Stripe_Payment_Methods::CARD;
+		}
+
+		if ( [] === $payment_method_ids_to_disable && [] === $payment_method_ids_to_enable ) {
 			return;
 		}
 
+		$enabled_payment_methods = array_merge(
+			$enabled_payment_methods,
+			$payment_method_ids_to_enable
+		);
+
 		$gateway->update_enabled_payment_methods(
 			array_diff( $enabled_payment_methods, $payment_method_ids_to_disable )
 		);

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 - Force the card payment method to be enabled when the Optimized Checkout is enabled in the merchant's Payment Method Configuration
 * Update - Deactivates Affirm or Klarna when other official plugins are active in merchant's Payment Method Configuration
 * Fix - Fixes issues related to booking multiple slots with express checkout payment methods enabled
 * Fix - Update the Optimized Checkout promotional inbox note to link to the relevant section in the Stripe settings page

tests/phpunit/WC_Stripe_Test.php

@@ -25,15 +25,20 @@ public function test_constants_defined() {
 	}
 
 	/**
-	 * Tests for `maybe_deactivate_payment_methods`.
+	 * Tests for `maybe_toggle_payment_methods`.
 	 *
+	 * @param array $active_gateways The active payment gateways.
+	 * @param array $enabled_payment_method_ids The enabled payment method IDs.
+	 * @param bool $oc_enabled Whether the one-click payment methods are enabled.
+	 * @param int $update_enable_payment_methods_calls The number of times `update_enabled_payment_methods` should be called.
 	 * @return void
 	 *
-	 * @dataProvider provide_test_maybe_deactivate_payment_methods
+	 * @dataProvider provide_test_maybe_toggle_payment_methods
 	 */
-	public function test_maybe_deactivate_payment_methods(
+	public function test_maybe_toggle_payment_methods(
 		$active_gateways,
 		$enabled_payment_method_ids,
+		$oc_enabled,
 		$update_enable_payment_methods_calls
 	) {
 		$original_payment_gateways = WC()->payment_gateways->payment_gateways;
@@ -45,6 +50,10 @@ public function test_maybe_deactivate_payment_methods(
 			->disableOriginalConstructor()
 			->getMock();
 
+		$upe_payment_gateway->expects( $this->once() )
+			->method( 'is_oc_enabled' )
+			->willReturn( $oc_enabled );
+
 		$upe_payment_gateway->expects( $this->once() )
 			->method( 'get_upe_enabled_payment_method_ids' )
 			->willReturn( $enabled_payment_method_ids );
@@ -61,7 +70,7 @@ public function test_maybe_deactivate_payment_methods(
 		$wc_stripe->method( 'get_main_stripe_gateway' )
 			->willReturn( $upe_payment_gateway );
 
-		$wc_stripe->maybe_deactivate_payment_methods();
+		$wc_stripe->maybe_toggle_payment_methods();
 
 		// Clean up.
 		WC()->payment_gateways->payment_gateways = $original_payment_gateways;
@@ -72,13 +81,14 @@ public function test_maybe_deactivate_payment_methods(
 	 *
 	 * @return array
 	 */
-	public function provide_test_maybe_deactivate_payment_methods() {
+	public function provide_test_maybe_toggle_payment_methods() {
 		return [
 			'none active'                                 => [
 				'active gateways'                     => [],
 				'enabled payment method IDs'          => [
 					WC_Stripe_Payment_Methods::CARD,
 				],
+				'OC enabled'                          => false,
 				'update enable payment methods calls' => 0,
 			],
 			'affirm'                                      => [
@@ -92,6 +102,7 @@ public function provide_test_maybe_deactivate_payment_methods() {
 					WC_Stripe_Payment_Methods::CARD,
 					WC_Stripe_Payment_Methods::AFFIRM,
 				],
+				'OC enabled'                          => false,
 				'update enable payment methods calls' => 1,
 			],
 			'klarna'                                      => [
@@ -105,6 +116,7 @@ public function provide_test_maybe_deactivate_payment_methods() {
 					WC_Stripe_Payment_Methods::CARD,
 					WC_Stripe_Payment_Methods::KLARNA,
 				],
+				'OC enabled'                          => false,
 				'update enable payment methods calls' => 1,
 			],
 			'klarna and affirm active, but not on Stripe' => [
@@ -121,6 +133,7 @@ public function provide_test_maybe_deactivate_payment_methods() {
 				'enabled payment method IDs'          => [
 					WC_Stripe_Payment_Methods::CARD,
 				],
+				'OC enabled'                          => false,
 				'update enable payment methods calls' => 0,
 			],
 			'klarna and affirm active in both'            => [
@@ -139,6 +152,7 @@ public function provide_test_maybe_deactivate_payment_methods() {
 					WC_Stripe_Payment_Methods::AFFIRM,
 					WC_Stripe_Payment_Methods::KLARNA,
 				],
+				'OC enabled'                          => false,
 				'update enable payment methods calls' => 1,
 			],
 			'amazon pay'                                  => [
@@ -147,6 +161,13 @@ public function provide_test_maybe_deactivate_payment_methods() {
 					WC_Stripe_Payment_Methods::CARD,
 					WC_Stripe_Payment_Methods::AMAZON_PAY,
 				],
+				'OC enabled'                          => false,
+				'update enable payment methods calls' => 1,
+			],
+			'card, OC enabled'                            => [
+				'active gateways'                     => [],
+				'enabled payment method IDs'          => [],
+				'OC enabled'                          => true,
 				'update enable payment methods calls' => 1,
 			],
 		];