Merge branch 'develop' into add/amazon-pay-payment-method

Author: annemirasol

.husky/post-merge

@@ -6,3 +6,27 @@ npx --no-install yarnhook
 
 # make sure the autoload files are regenerated
 composer dumpautoload
+
+DEV_TOOLS_PLUGIN_PATH=${LOCAL_STRIPE_DEV_TOOLS_PLUGIN_REPO_PATH:-"docker/wordpress/wp-content/plugins/woocommerce-gateway-stripe-dev-tools"}
+if [ ! -d $DEV_TOOLS_PLUGIN_PATH ]; then
+	echo
+    echo "\033[33mCouldn't find the '$DEV_TOOLS_PLUGIN_PATH' directory. Skipping the auto-update for the Stripe Dev Tools plugin...\033[0m"
+else
+	if [ "$(cd $DEV_TOOLS_PLUGIN_PATH && git rev-parse --show-toplevel 2>/dev/null)" = "$(cd $DEV_TOOLS_PLUGIN_PATH && pwd)" ]; then
+		echo
+		echo "\033[32mDetermining if there is an update for the Stripe Dev Tools plugin...\033[0m"
+
+		DEV_TOOLS_BRANCH=$(cd $DEV_TOOLS_PLUGIN_PATH && git branch --show-current)
+		if [[ $DEV_TOOLS_BRANCH = "trunk" ]]; then
+			echo "  \033[32mThe current branch is $DEV_TOOLS_BRANCH. Check if we are safe to pull from origin/$DEV_TOOLS_BRANCH...\033[0m"
+			if [[ `cd $DEV_TOOLS_PLUGIN_PATH && git status --porcelain` ]]; then
+				echo "\033[33m  There are uncommitted local changes on the Stripe Dev Tools repo. Skipping any attempt to update it.\033[0m"
+			else
+				echo "  \033[32mPulling the latest changes from origin/$DEV_TOOLS_BRANCH, if any...\033[0m"
+				cd $DEV_TOOLS_PLUGIN_PATH && git pull
+			fi
+		else
+			echo "\033[33m  The Stripe Dev Tools local clone is not on the trunk branch. Skipping any attempt to update it.\033[0m"
+		fi
+	fi
+fi

bin/docker-setup.sh

@@ -114,6 +114,17 @@ cli wp import wp-content/plugins/woocommerce/sample-data/sample_products.xml --a
 echo "Activating the WooCommerce Stripe Payment Gateway plugin..."
 cli wp plugin activate woocommerce-gateway-stripe
 
+echo "Installing dev tools plugin..."
+set +e
+git clone [email protected]:woocommerce/woocommerce-gateway-stripe-dev-tools.git docker/wordpress/wp-content/plugins/woocommerce-gateway-stripe-dev-tools
+if [[ $? -eq 0 ]]; then
+	cli wp plugin activate woocommerce-gateway-stripe-dev-tools
+else
+	echo
+	echo "WARN: Could not clone the dev tools repository. Skipping the install."
+fi
+set -e
+
 echo
 echo "SUCCESS! You should now be able to access http://${SITE_URL}/wp-admin/"
 echo "You can login by using the username and password both as 'admin'"

changelog.txt

@@ -1,6 +1,8 @@
 *** Changelog ***
 
 = 9.3.0 - xxxx-xx-xx =
+* Fix - Improves the checking for existing customer attribute when retrieving a payment method that may be detached from a subscription.
+* Fix - Reverts the default value for the `capture_method` property to avoid breaking Amazon Pay when creating a payment intent.
 * Add - Adds a new feature flag to handle the Single Payment Element feature.
 * Dev - Moves the method to check if the subscriptions extension is enabled to a new helper class.
 * Dev - Moves and refactor some of the UPE-related code to make Single Payment Element development easier.
@@ -32,6 +34,7 @@
 * Fix - ACSS: Handle errors and edge cases.
 * Add - Add subscriptions support to Bacs.
 * Update - Add tracks events for payment method settings updates.
+* Fix - Fix issue where Legacy Checkout settings get overwritten with old value.
 * Add - Add WooCommerce Pre-Orders support to Bacs.
 * Tweak - Fix background in express checkout settings.
 * Add - Add Amazon Pay payment method class.

includes/admin/class-wc-rest-stripe-settings-controller.php

@@ -527,15 +527,12 @@ private function update_is_upe_enabled( WP_REST_Request $request ) {
 			return;
 		}
 
-		$settings = WC_Stripe_Helper::get_stripe_settings();
-
 		// If the new UPE is enabled, we need to remove the flag to ensure legacy SEPA tokens are updated flag.
 		if ( $is_upe_enabled && ! WC_Stripe_Feature_Flags::is_upe_checkout_enabled() ) {
 			delete_option( 'woocommerce_stripe_subscriptions_legacy_sepa_tokens_updated' );
 		}
 
-		$settings[ WC_Stripe_Feature_Flags::UPE_CHECKOUT_FEATURE_ATTRIBUTE_NAME ] = $is_upe_enabled ? 'yes' : 'disabled';
-		WC_Stripe_Helper::update_main_stripe_settings( $settings );
+		$this->gateway->update_option( WC_Stripe_Feature_Flags::UPE_CHECKOUT_FEATURE_ATTRIBUTE_NAME, $is_upe_enabled ? 'yes' : 'disabled' );
 
 		// including the class again because otherwise it's not present.
 		if ( WC_Stripe_Inbox_Notes::are_inbox_notes_supported() ) {

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

@@ -48,7 +48,7 @@ public static function get_detached_subscriptions() {
 			$source_id = $subscription->get_meta( '_stripe_source_id' );
 			if ( $source_id ) {
 				$payment_method = WC_Stripe_API::get_payment_method( $source_id );
-				if ( ! $payment_method->customer ) {
+				if ( empty( $payment_method->customer ) ) {
 					$detached_subscriptions[] = [
 						'id'                        => $subscription->get_id(),
 						'customer_id'               => $subscription->get_meta( '_stripe_customer_id' ),

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

@@ -2213,7 +2213,6 @@ protected function prepare_payment_information_from_request( WC_Order $order ) {
 			'payment_method'                => '',
 			'payment_method_details'        => [],
 			'payment_type'                  => 'single', // single | recurring.
-			'capture_method'                => $capture_method,
 		];
 
 		if ( 'us_bank_account' === $selected_payment_type ) {
@@ -2230,6 +2229,7 @@ protected function prepare_payment_information_from_request( WC_Order $order ) {
 				$order,
 				$payment_method_details
 			);
+			$payment_information['capture_method']               = $capture_method;
 		} else {
 			$confirmation_token_id                               = sanitize_text_field( wp_unslash( $_POST['wc-stripe-confirmation-token'] ?? '' ) );
 			$payment_information['confirmation_token']           = $confirmation_token_id;
@@ -2243,6 +2243,8 @@ protected function prepare_payment_information_from_request( WC_Order $order ) {
 						'capture_method' => 'manual',
 					],
 				];
+			} else {
+				$payment_information['capture_method'] = $capture_method;
 			}
 
 			// When using confirmation tokens for subscriptions, we need to set the setup_future_usage parameter under payment method options.

includes/payment-methods/class-wc-stripe-upe-payment-method-bacs-debit.php

@@ -30,18 +30,14 @@ public function __construct() {
 		$this->accept_only_domestic_payment = true;
 		$this->label                        = __( 'Bacs Direct Debit', 'woocommerce-gateway-stripe' );
 		$this->description                  = __( 'Bacs Direct Debit enables customers in the UK to pay by providing their bank account details.', 'woocommerce-gateway-stripe' );
+		$this->supports[]                   = 'tokenization';
 
 		// Check if subscriptions are enabled and add support for them.
 		$this->maybe_init_subscriptions();
 
 		// Add support for pre-orders.
 		$this->maybe_init_pre_orders();
 
-		// Remove Bacs from the “Add Payment Method” page for now, as its implementation will be handled later.
-		if ( is_wc_endpoint_url( 'add-payment-method' ) ) {
-			unset( $this->supports['tokenization'] );
-		}
-
 		$this->maybe_hide_bacs_payment_gateway();
 	}
 
@@ -105,7 +101,8 @@ public function maybe_hide_bacs_payment_gateway() {
 			function ( $available_gateways ) {
 				if (
 					$this->should_hide_bacs_for_pre_orders_charge_upon_release() ||
-					$this->should_hide_bacs_for_subscriptions_with_free_trials()
+					$this->should_hide_bacs_for_subscriptions_with_free_trials() ||
+					$this->should_hide_bacs_on_add_payment_method_page()
 				) {
 					unset( $available_gateways['stripe_bacs_debit'] );
 				}
@@ -114,6 +111,19 @@ function ( $available_gateways ) {
 		);
 	}
 
+	/**
+	 * Determines whether the Bacs payment gateway should be hidden on the "Add Payment Method" page.
+	 *
+	 * @return bool True if the Bacs payment gateway should be hidden, false otherwise.
+	 */
+	public function should_hide_bacs_on_add_payment_method_page() {
+		if ( is_wc_endpoint_url( 'add-payment-method' ) ) {
+			return true;
+		}
+
+		return false;
+	}
+
 	/**
 	 * Determines whether the Bacs payment gateway should be hidden for pre-orders that are charged upon release.
 	 *
@@ -143,10 +153,8 @@ public function should_hide_bacs_for_pre_orders_charge_upon_release() {
 	 * @return bool True if Bacs should be hidden, false otherwise.
 	 */
 	public function should_hide_bacs_for_subscriptions_with_free_trials() {
-		global $post;
-		$is_checkout_shortcode_page          = wc_post_content_has_shortcode( 'woocommerce_checkout' ) || has_block( 'woocommerce/classic-shortcode', $post );
 		$is_update_order_review_ajax_request = defined( 'DOING_AJAX' ) && DOING_AJAX && isset( $_REQUEST['wc-ajax'] ) && 'update_order_review' === $_REQUEST['wc-ajax'];
-		if ( $is_checkout_shortcode_page || $is_update_order_review_ajax_request ) {
+		if ( is_checkout() || $is_update_order_review_ajax_request ) {
 			// Checking if the amount is zero allows us to process orders that include subscriptions with a free trial,
 			// as long as another product increases the total amount, ensuring compatibility with Bacs.
 			if ( class_exists( 'WC_Subscriptions_Cart' ) && WC_Subscriptions_Cart::cart_contains_free_trial() && (float) WC()->cart->total === 0.00 ) {

readme.txt

@@ -111,6 +111,8 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 == Changelog ==
 
 = 9.3.0 - xxxx-xx-xx =
+* Fix - Improves the checking for existing customer attribute when retrieving a payment method that may be detached from a subscription.
+* Fix - Reverts the default value for the `capture_method` property to avoid breaking Amazon Pay when creating a payment intent.
 * Add - Adds a new feature flag to handle the Single Payment Element feature.
 * Dev - Moves the method to check if the subscriptions extension is enabled to a new helper class.
 * Dev - Moves and refactor some of the UPE-related code to make Single Payment Element development easier.
@@ -142,6 +144,7 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 * Fix - ACSS: Handle errors and edge cases.
 * Add - Add subscriptions support to Bacs.
 * Update - Add tracks events for payment method settings updates.
+* Fix - Fix issue where Legacy Checkout settings get overwritten with old value.
 * Add - Add WooCommerce Pre-Orders support to Bacs.
 * Tweak - Fix background in express checkout settings.
 * Add - Add Amazon Pay payment method class.