Merge trunk v5.5.1 into develop

Author: botwoo

changelog.txt

@@ -1,5 +1,13 @@
 *** WooCommerce Payments Changelog ***
 
+= 5.5.1 - 2023-03-01 =
+* Add - When enabling WooPay, if legacy UPE is enabled, upgrades feature flag to split UPE instead.
+* Fix - Avoid rendering save cards checkbox for logged out users
+* Fix - Fix get woopay available countries return type
+* Fix - Fix handling saved tokens for payment gateways while using shortcode checkout
+* Fix - Fix subscription renewal creating multiple charges with UPE.
+* Fix - Fix WooPay settings notice visibility
+
 = 5.5.0 - 2023-02-22 =
 * Add - Added learn more link to deposits page
 * Add - Added tracking for the split UPE feature flag.

includes/class-wc-payments-checkout.php

@@ -210,7 +210,9 @@ public function payment_fields() {
 				<?php
 				if ( $this->gateway->is_saved_cards_enabled() ) {
 					$force_save_payment = ( $display_tokenization && ! apply_filters( 'wc_payments_display_save_payment_method_checkbox', $display_tokenization ) ) || is_add_payment_method_page();
-					$this->gateway->save_payment_method_checkbox( $force_save_payment );
+					if ( is_user_logged_in() || $force_save_payment ) {
+						$this->gateway->save_payment_method_checkbox( $force_save_payment );
+					}
 				}
 				?>
 

includes/compat/subscriptions/trait-wc-payment-gateway-wcpay-subscriptions.php

@@ -85,6 +85,15 @@ abstract protected function prepare_payment_information( $order );
 	 */
 	private static $payment_method_meta_key = 'token';
 
+	/**
+	 * Stores a flag to indicate if the subscription integration hooks have been attached.
+	 *
+	 * The callbacks attached as part of maybe_init_subscriptions() only need to be attached once to avoid duplication.
+	 *
+	 * @var bool False by default, true once the callbacks have been attached.
+	 */
+	private static $has_attached_integration_hooks = false;
+
 	/**
 	 * Initialize subscription support and hooks.
 	 */
@@ -95,7 +104,7 @@ public function maybe_init_subscriptions() {
 
 		/*
 		 * Base set of subscription features to add.
-		 * The WCPay payment gateway supports these feautres
+		 * The WCPay payment gateway supports these features
 		 * for both WCPay Subscriptions and WooCommerce Subscriptions.
 		 */
 		$payment_gateway_features = [
@@ -131,6 +140,19 @@ public function maybe_init_subscriptions() {
 
 		$this->supports = array_merge( $this->supports, $payment_gateway_features );
 
+		/**
+		 * The following callbacks are only attached once to avoid duplication.
+		 * The callbacks are also only intended to be attached for the WCPay core payment gateway ($this->id = 'woocommerce_payments').
+		 *
+		 * If new payment method IDs (eg 'sepa_debit') are added to this condition in the future, care should be taken to ensure duplication,
+		 * including double renewal charging, isn't introduced.
+		 */
+		if ( self::$has_attached_integration_hooks || 'woocommerce_payments' !== $this->id ) {
+			return;
+		}
+
+		self::$has_attached_integration_hooks = true;
+
 		add_filter( 'woocommerce_email_classes', [ $this, 'add_emails' ], 20 );
 		add_filter( 'woocommerce_available_payment_gateways', [ $this, 'prepare_order_pay_page' ] );
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "woocommerce-payments",
-  "version": "5.5.0",
+  "version": "5.5.1",
   "main": "webpack.config.js",
   "author": "Automattic",
   "license": "GPL-3.0-or-later",

package.json

@@ -4,7 +4,7 @@ Tags: payment gateway, payment, apple pay, credit card, google pay
 Requires at least: 5.9
 Tested up to: 6.1
 Requires PHP: 7.0
-Stable tag: 5.5.0
+Stable tag: 5.5.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -98,6 +98,14 @@ Please note that our support for the checkout block is still experimental and th
 
 == Changelog ==
 
+= 5.5.1 - 2023-03-01 =
+* Add - When enabling WooPay, if legacy UPE is enabled, upgrades feature flag to split UPE instead.
+* Fix - Avoid rendering save cards checkbox for logged out users
+* Fix - Fix get woopay available countries return type
+* Fix - Fix handling saved tokens for payment gateways while using shortcode checkout
+* Fix - Fix subscription renewal creating multiple charges with UPE.
+* Fix - Fix WooPay settings notice visibility
+
 = 5.5.0 - 2023-02-22 =
 * Add - Added learn more link to deposits page
 * Add - Added tracking for the split UPE feature flag.

readme.txt

@@ -75,6 +75,16 @@ class WC_Payment_Gateway_WCPay_Subscriptions_Payment_Method_Order_Note_Test exte
 	 */
 	private $mock_wcpay_account;
 
+	public function tear_down() {
+		parent::tear_down();
+
+		// So that the gateway hooks are re-attached for the next test, we need to reset the flag that prevents the integration hooks from being attached.
+		$reflection = new \ReflectionClass( $this->wcpay_gateway );
+		$property   = $reflection->getProperty( 'has_attached_integration_hooks' );
+		$property->setAccessible( true );
+		$property->setValue( $this->wcpay_gateway, false );
+	}
+
 	public function set_up() {
 		parent::set_up();
 

tests/unit/test-class-wc-payment-gateway-wcpay-subscriptions-payment-method-order-note.php

@@ -782,7 +782,8 @@ public function test_adds_custom_payment_meta_input_fallback_until_subs_3_0_7()
 		remove_all_actions( 'woocommerce_admin_order_data_after_billing_address' );
 
 		WC_Subscriptions::$version = '3.0.7';
-		new \WC_Payment_Gateway_WCPay(
+
+		$payment_gateway = new \WC_Payment_Gateway_WCPay(
 			$this->mock_api_client,
 			$this->mock_wcpay_account,
 			$this->mock_customer_service,
@@ -792,6 +793,13 @@ public function test_adds_custom_payment_meta_input_fallback_until_subs_3_0_7()
 			$this->order_service
 		);
 
+		// Ensure the has_attached_integration_hooks property is set to false so callbacks can be attached in maybe_init_subscriptions().
+		$ref = new ReflectionProperty( $payment_gateway, 'has_attached_integration_hooks' );
+		$ref->setAccessible( true );
+		$ref->setValue( null, false );
+
+		$payment_gateway->maybe_init_subscriptions();
+
 		$this->assertTrue( has_action( 'woocommerce_admin_order_data_after_billing_address' ) );
 	}
 

tests/unit/test-class-wc-payment-gateway-wcpay-subscriptions.php

@@ -324,6 +324,42 @@ function ( $output ) {
 		$this->wcpay_gateway->payment_fields();
 	}
 
+	public function test_save_card_checkbox_not_displayed_for_non_logged_in_users() {
+		$this->wcpay_gateway->update_option( 'saved_cards', 'yes' );
+		wp_set_current_user( 0 );
+
+		$this->refresh_payments_checkout();
+
+		// Use a callback to get and test the output (also suppresses the output buffering being printed to the CLI).
+		$this->setOutputCallback(
+			function ( $output ) {
+				$result = preg_match_all( '/.*<input.*id="wc-woocommerce_payments-new-payment-method".*\/>.*/', $output );
+
+				$this->assertSame( 0, $result );
+			}
+		);
+
+		$this->wcpay_gateway->payment_fields();
+	}
+
+	public function test_save_card_checkbox_displayed_for_logged_in_users() {
+		$this->wcpay_gateway->update_option( 'saved_cards', 'yes' );
+		wp_set_current_user( 1 );
+
+		$this->refresh_payments_checkout();
+
+		// Use a callback to get and test the output (also suppresses the output buffering being printed to the CLI).
+		$this->setOutputCallback(
+			function ( $output ) {
+				$result = preg_match_all( '/.*<input.*id="wc-woocommerce_payments-new-payment-method".*\/>.*/', $output );
+
+				$this->assertSame( 1, $result );
+			}
+		);
+
+		$this->wcpay_gateway->payment_fields();
+	}
+
 	public function test_fraud_prevention_token_added_when_enabled() {
 		$token_value                   = 'test-token';
 		$fraud_prevention_service_mock = $this->get_fraud_prevention_service_mock();

tests/unit/test-class-wc-payment-gateway-wcpay.php

@@ -12,7 +12,7 @@
  * WC tested up to: 7.3.0
  * Requires at least: 5.9
  * Requires PHP: 7.0
- * Version: 5.5.0
+ * Version: 5.5.1
  *
  * @package WooCommerce\Payments
  */