Commit a13f9aead9 for woocommerce

commit a13f9aead966519efcaf8a4fb9b7eae6370d06e8
Author: Nagesh Pai <4162931+nagpai@users.noreply.github.com>
Date:   Tue Jul 1 18:30:44 2025 +0530

    Shipping Zone - Conditionally show blockbased location settings link (#59257)

    Co-authored-by: Nagesh Pai <nagesh@automattic.com>
    Co-authored-by: github-actions <github-actions@github.com>
    Co-authored-by: Thomas Roberts <5656702+opr@users.noreply.github.com>

diff --git a/plugins/woocommerce/changelog/59257-fix-57157-hide-local-pickup-settings-link-shortcode-checkout b/plugins/woocommerce/changelog/59257-fix-57157-hide-local-pickup-settings-link-shortcode-checkout
new file mode 100644
index 0000000000..ee89ab6cfb
--- /dev/null
+++ b/plugins/woocommerce/changelog/59257-fix-57157-hide-local-pickup-settings-link-shortcode-checkout
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Show local pickup link within Shipping zones settings description conditionally when store uses block checkout
\ No newline at end of file
diff --git a/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zones.php b/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zones.php
index e912d4b84f..8b0b43616d 100644
--- a/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zones.php
+++ b/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zones.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Shipping zones admin page.
+ *
+ * @package WooCommerce\Admin\Shipping
+ */
+
+use Automattic\WooCommerce\Blocks\Utils\CartCheckoutUtils;
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
@@ -10,16 +18,23 @@ if ( ! defined( 'ABSPATH' ) ) {
 </h2>
 <p class="wc-shipping-zone-heading-help-text">
 	<?php
-	echo wp_kses_post(
-		sprintf(
-			/* translators: %s: URL to local pickup settings */
-			__(
-				"A shipping zone consists of the region(s) you'd like to ship to and the shipping method(s) offered. A shopper can only be matched to one zone, and we'll use their shipping address to show them the methods available in their area. To offer local pickup, configure your pickup locations in the <a href='%s'>local pickup settings</a>.",
-				'woocommerce'
-			),
-			esc_url( admin_url( 'admin.php?page=wc-settings&tab=shipping&section=pickup_location' ) )
-		)
+	esc_html_e(
+		"A shipping zone consists of the region(s) you'd like to ship to and the shipping method(s) offered. A shopper can only be matched to one zone, and we'll use their shipping address to show them the methods available in their area.",
+		'woocommerce'
 	);
+
+	if ( CartCheckoutUtils::is_checkout_block_default() ) {
+		echo ' ' . wp_kses_post(
+			sprintf(
+			/* translators: %s: URL to local pickup settings */
+				__(
+					"To offer local pickup, configure your pickup locations in the <a href='%s'>local pickup settings</a>.",
+					'woocommerce'
+				),
+				esc_url( admin_url( 'admin.php?page=wc-settings&tab=shipping&section=pickup_location' ) )
+			)
+		);
+	}
 	?>
 </p>
 <table class="wc-shipping-zones widefat">