No longer load classic checkout scripts on the block checkout page

woocommerce · Jan 23, 2024 · 514c25b · 514c25b
1 parent 24c9fab
commit 514c25b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/includes/class-wc-stripe-helper.php b/includes/class-wc-stripe-helper.php
@@ -689,7 +689,16 @@ public static function convert_wc_locale_to_stripe_locale( $wc_locale ) {
 	 * @return boolean
 	 */
 	public static function has_cart_or_checkout_on_current_page() {
-		return is_cart() || is_checkout() || has_block( 'woocommerce/cart' ) || has_block( 'woocommerce/checkout' );
+		return is_cart() || is_checkout() || self::has_cart_or_checkout_block_on_current_page();
+	}
+
+	/**
+	 * Checks if this page has a cart or checkout block.
+	 *
+	 * @return bool
+	 */
+	public static function has_cart_or_checkout_block_on_current_page() {
+		return has_block( 'woocommerce/cart' ) || has_block( 'woocommerce/checkout' );
 	}
 
 	/**

diff --git a/includes/payment-methods/class-wc-stripe-upe-payment-gateway.php b/includes/payment-methods/class-wc-stripe-upe-payment-gateway.php
@@ -257,6 +257,14 @@ public function payment_scripts() {
 			true
 		);
 
+		wp_register_style( 'stripelink_styles', plugins_url( 'assets/css/stripe-link.css', WC_STRIPE_MAIN_FILE ), [], WC_STRIPE_VERSION );
+		wp_enqueue_style( 'stripelink_styles' );
+
+		// The rest of this function is specific to classic pages so bail if we're not on one.
+		if ( WC_Stripe_Helper::has_cart_or_checkout_block_on_current_page() ) {
+			return;
+		}
+
 		wp_register_script(
 			'wc-stripe-upe-classic',
 			WC_STRIPE_PLUGIN_URL . '/build/upe_classic.js',
@@ -284,9 +292,6 @@ public function payment_scripts() {
 
 		wp_enqueue_script( 'wc-stripe-upe-classic' );
 		wp_enqueue_style( 'wc-stripe-upe-classic' );
-
-		wp_register_style( 'stripelink_styles', plugins_url( 'assets/css/stripe-link.css', WC_STRIPE_MAIN_FILE ), [], WC_STRIPE_VERSION );
-		wp_enqueue_style( 'stripelink_styles' );
 	}
 
 	/**