Merge branch 'trunk' into develop

Author: Mayisha

changelog.txt

@@ -1,10 +1,12 @@
 *** Changelog ***
 
-= 9.4.0 - xxxx-xx-xx =
+= 9.5.0 - xxxx-xx-xx =
 * Tweak - Removes the Stripe icon beside the Smart Checkout payment element from the checkout pages.
 * Add - New setting to allow merchants to set their preferred title for the Smart Checkout payment element. Defaults to "Stripe".
 * Dev - Implements the new Stripe order class into the compatibility classes.
 * Dev - Updates the Code Sniffer package to version 1.0.0.
+
+= 9.4.0 - 2025-04-16 =
 * Add - New filter to allow merchants to bypass the default visibility of the express payment method buttons when taxes are based on customer's billing address (`wc_stripe_should_hide_express_checkout_button_based_on_tax_setup`).
 * Dev - Improves Smart Checkout code with shared and new methods, on both front and backend.
 * Fix - Fixes the saving of payment methods when Smart Checkout is enabled.
@@ -64,9 +66,9 @@
 * Fix - Ensure the subscription and pre-order objects are not converted into a Stripe order object in legacy experience.
 * Update - Credit and Bank (BECS and ACSS) icons on the Block checkout page.
 * Fix - Fix BLIK visibility based on account and billing countries.
-* Fix - Prepare mandate data from subscription object on change payment method page.
 * Add - Use Stripe Configuration API to manage payment methods enabled/disabled states.
 * Dev - Add track events when enabling/disabling payment methods.
+* Fix - Prepare mandate data from subscription object on change payment method page.
 
 = 9.3.2 - 2025-04-10 =
 * Fix - Fix express checkout for block cart and block checkout for WooCommerce 9.8.0+.

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

@@ -661,7 +661,9 @@ private function update_enabled_payment_methods( $payment_method_ids_to_enable,
 			return;
 		}
 
-		$this->gateway->update_enabled_payment_methods( $payment_method_ids_to_enable );
+		if ( $this->gateway instanceof WC_Stripe_UPE_Payment_Gateway ) {
+			$this->gateway->update_enabled_payment_methods( $payment_method_ids_to_enable );
+		}
 	}
 
 	/**

includes/class-wc-stripe-blocks-support.php

@@ -43,8 +43,15 @@ final class WC_Stripe_Blocks_Support extends AbstractPaymentMethodType {
 	public function __construct( $payment_request_configuration = null, $express_checkout_configuration = null ) {
 		add_action( 'woocommerce_rest_checkout_process_payment_with_context', [ $this, 'add_payment_request_order_meta' ], 8, 2 );
 		add_action( 'woocommerce_rest_checkout_process_payment_with_context', [ $this, 'add_stripe_intents' ], 9999, 2 );
-		$this->payment_request_configuration  = null !== $payment_request_configuration ? $payment_request_configuration : new WC_Stripe_Payment_Request();
-		$this->express_checkout_configuration = null !== $express_checkout_configuration ? $express_checkout_configuration : new WC_Stripe_Express_Checkout_Element();
+		$this->payment_request_configuration = null !== $payment_request_configuration ? $payment_request_configuration : new WC_Stripe_Payment_Request();
+
+		if ( null === $express_checkout_configuration ) {
+			$gateway = WC_Stripe::get_instance()->get_main_stripe_gateway();
+			$helper = new WC_Stripe_Express_Checkout_Helper( $gateway );
+			$ajax_handler = new WC_Stripe_Express_Checkout_Ajax_Handler( $helper );
+			$express_checkout_configuration = new WC_Stripe_Express_Checkout_Element( $ajax_handler, $helper );
+		}
+		$this->express_checkout_configuration = $express_checkout_configuration;
 	}
 
 	/**

includes/class-wc-stripe-intent-controller.php

@@ -430,7 +430,7 @@ public function update_payment_intent_ajax() {
 	 * Updates payment intent or setup intent to be able to save payment method.
 	 *
 	 * @since 5.6.0
-	 * @version x.x.x
+	 * @version 9.4.0
 	 *
 	 * @param {string}  $intent_id                 The id of the payment intent or setup intent to update.
 	 * @param {int}     $order_id                  The id of the order if intent created from Order.
@@ -520,7 +520,7 @@ public function update_intent( $intent_id = '', $order_id = null, $save_payment_
 	 * Handle AJAX requests for creating a setup intent without confirmation for Stripe UPE.
 	 *
 	 * @since 5.6.0
-	 * @version x.x.x
+	 * @version 9.4.0
 	 */
 	public function init_setup_intent_ajax() {
 		try {
@@ -548,7 +548,7 @@ public function init_setup_intent_ajax() {
 	 * Creates a setup intent without confirmation.
 	 *
 	 * @since 5.6.0
-	 * @version x.x.x
+	 * @version 9.4.0
 	 *
 	 * @param string|null $payment_method_type The type of payment method to use for the intent.
 	 * @return array

includes/payment-tokens/class-wc-stripe-acss-payment-token.php

@@ -10,7 +10,7 @@
  *
  * Token for ACSS.
  *
- * @since x.x.x
+ * @since 9.4.0
  */
 class WC_Payment_Token_ACSS extends WC_Payment_Token implements WC_Stripe_Payment_Method_Comparison_Interface {
 	use WC_Stripe_Fingerprint_Trait;

includes/payment-tokens/class-wc-stripe-becs-debit-payment-token.php

@@ -12,7 +12,7 @@
  * Representation of a payment token for BECS.
  *
  * @class    WC_Payment_Token_Becs_Debit
- * @since    x.x.x
+ * @since    9.4.0
  */
 class WC_Payment_Token_Becs_Debit extends WC_Payment_Token implements WC_Stripe_Payment_Method_Comparison_Interface {
 

includes/payment-tokens/class-wc-stripe-payment-tokens.php

@@ -65,8 +65,8 @@ public static function get_instance() {
 	/**
 	 * Normalizes the payment method labels on My Account page.
 	 *
-	 * @since x.x.x
-	 * @version x.x.x
+	 * @since 9.4.0
+	 * @version 9.4.0
 	 * @param string $label
 	 * @return string $label
 	 */

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "woocommerce-gateway-stripe",
   "title": "WooCommerce Gateway Stripe",
-  "version": "9.3.2",
+  "version": "9.4.0",
   "license": "GPL-3.0",
   "homepage": "http://wordpress.org/plugins/woocommerce-gateway-stripe/",
   "repository": {

package.json

@@ -4,7 +4,7 @@ Tags: credit card, stripe, apple pay, payment request, google pay, sepa, bancont
 Requires at least: 6.5
 Tested up to: 6.7
 Requires PHP: 7.4
-Stable tag: 9.3.2
+Stable tag: 9.4.0
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Attributions: thorsten-stripe
@@ -110,72 +110,10 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 
 == Changelog ==
 
-= 9.4.0 - xxxx-xx-xx =
+= 9.5.0 - xxxx-xx-xx =
 * Tweak - Removes the Stripe icon beside the Smart Checkout payment element from the checkout pages.
 * Add - New setting to allow merchants to set their preferred title for the Smart Checkout payment element. Defaults to "Stripe".
 * Dev - Implements the new Stripe order class into the compatibility classes.
 * Dev - Updates the Code Sniffer package to version 1.0.0.
-* Add - New filter to allow merchants to bypass the default visibility of the express payment method buttons when taxes are based on customer's billing address (`wc_stripe_should_hide_express_checkout_button_based_on_tax_setup`).
-* Dev - Improves Smart Checkout code with shared and new methods, on both front and backend.
-* Fix - Fixes the saving of payment methods when Smart Checkout is enabled.
-* Tweak - Correctly handles the display of payment method instructions when Smart Checkout is enabled.
-* Dev - Implements the new Stripe order class into abstract/base classes, and the webhook handler.
-* Dev - Implements the new Stripe order class into the legacy checkout classes.
-* Dev - Do not generate filenames with underscores.
-* Fix - Fixes the Stripe checkout container visuals when Smart Checkout is disabled.
-* Dev - Implements the new Stripe order class into the express checkout classes.
-* Dev - Implements the new Stripe order class into the wp-admin related classes.
-* Dev - Replaces references to order status values with their respective constants from the WooCommerce plugin.
-* Tweak - Updates the Smart Checkout (classic/shortcode checkout version) to make all the payment methods look as similar as possible to any other WooCommerce payment method.
-* Tweak - Updates the Smart Checkout (block checkout version) to make all the payment methods look as similar as possible to any other WooCommerce payment method.
-* Fix - Improves the subscriptions detached admin notice, making it less intrusive and limiting the querying to 5 subscriptions (avoiding slow loading times).
-* Dev - Implements the new Stripe order class into the PHP unit tests.
-* Dev - Introduces new payment method constants for the express methods: Google Pay, Apple Pay, Link, and Amazon Pay (backend version).
-* Dev - Introduces a new Stripe Order class to wrap Stripe-specific logic and data on the backend.
-* Dev - Improves how we handle express payment method titles by introducing new constants and methods to replace duplicate code.
-* Fix - Fixes an issue where the order signature retrieval method could throw a fatal error when the received order parameter is actually an OrderRefund object (instead of a WC_Order).
-* Fix - Fixes a possible fatal error when a product added to the cart cannot be found (with Payment Request Buttons).
-* Add - Add Amazon Pay payment method class.
-* Add - Implements the Single Payment Element feature for the new checkout experience on the classic/shortcode checkout page.
-* Tweak - Record a Tracks event when enabling/disabling SPE
-* Tweak - Updates the Single Payment Element setting copy. Now it is labeled "Smart Checkout".
-* Update - Enable/disable Amazon Pay by adding/removing it from the enabled payment methods list.
-* Add - Add ACSS payment tokenization.
-* Add - Add BLIK payment method.
-* Fix - Prevent reuse of payment intents when order total doesn't match intent amount.
-* Update - Update payment method type for Amazon Pay orders.
-* Fix - Compatibility with email preview in the Auth Requested email
-* Update - Update Alipay and bank debit icons.
-* Tweak - Update payment method type check for charge.succeeded webhook.
-* Fix - Fixed subscription features not being properly registered when hooks were already attached.
-* Add - Disable unsupported payment methods in Stripe settings
-* Update - Update handling of PR as a country in the terminal locations endpoint.
-* Fix - Hide Amazon Pay in settings when legacy checkout is enabled.
-* Fix - Fix subscription renewal issues for Amazon Pay.
-* Fix - Fix ECE button width in shortcode cart page.
-* Tweak - SPE: Remove radio buttons
-* Add - Add Klarna support for some additional countries in EEA
-* Update - Hide express checkout buttons when no product variation is selected.
-* Fix - Translation warning when initializing the status page information.
-* Add - Add ACSS support for WC Subscriptions.
-* Fix - ECE checkout error when using extensions that reduce total cart amount (eg: Gift Cards)
-* Add - Add WooCommerce Pre-Orders support to ACSS.
-* Update - Remove unused shopper tracking
-* Add - Add BLIK support for WooCommerce Pre-Orders
-* Add - Test mode instructions for BLIK.
-* Tweak - Add save payment method parameter to update intent call for non-deferred intent payment methods.
-* Fix - Checkout page focus loss
-* Fix - Updated payment method radio button selector to correctly find the selected payment method in different themes.
-* Fix - Add `wc_stripe_generate_create_intent_request` filter to support mandate information in setup intent creation.
-* Add - Support for BECS Direct Debit as a new payment method for Australian accounts.
-* Update - Back button on the settings pages.
-* Update - Use individual product tax status instead of storewide tax setup when determining express checkout availability.
-* Fix - Ensure the subscription object is not converted into a Stripe order object.
-* Fix - Ensure the subscription and pre-order objects are not converted into a Stripe order object in legacy experience.
-* Update - Credit and Bank (BECS and ACSS) icons on the Block checkout page.
-* Fix - Fix BLIK visibility based on account and billing countries.
-* Fix - Prepare mandate data from subscription object on change payment method page.
-* Add - Use Stripe Configuration API to manage payment methods enabled/disabled states.
-* Dev - Add track events when enabling/disabling payment methods.
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).