Merge branch 'trunk' into add/plugin-check

changelog.txt

@@ -1,5 +1,13 @@
 *** WooCommerce Square Changelog ***
 
+= 4.8.5 - 2025-01-20 =
+* Fix - Unblock the Checkout page UI, and show a generic error when buyer verification fails.
+* Fix - Ensure inventory sync works correctly for variable products when Square sync is enabled through quick or bulk edit.
+* Dev - Bump WooCommerce "tested up to" version 9.6.
+* Dev - Bump WooCommerce minimum supported version to 9.4.
+* Dev - Use the `@woocommerce/e2e-utils-playwright` NPM package for E2E tests.
+* Dev - Updates GitHub `actions/cache`, `actions/upload` and `actions/download` to v4 due to deprecation.
+
 = 4.8.4 - 2024-12-09 =
 * Fix - Resolved the product duplication issue on the Square side when WooCommerce is set as the SOR.
 * Fix - Remove `woocommerce_loop_add_to_cart_link` filter to standardize "Buy Gift Card" and "Add to Cart" button styles across themes.

package.json

@@ -7,7 +7,7 @@
     "url": "git://github.com/woocommerce/woocommerce-square.git"
   },
   "title": "WooCommerce Square",
-  "version": "4.8.4",
+  "version": "4.8.5",
   "homepage": "https://woocommerce.com/products/woocommerce-square/",
   "scripts": {
     "build": "composer install --no-dev && npm run build:webpack && npm run makepot && npm run archive",

readme.txt

@@ -4,7 +4,7 @@ Tags: credit card, square, woocommerce, inventory sync
 Requires at least: 6.5
 Tested up to: 6.7
 Requires PHP: 7.4
-Stable tag: 4.8.4
+Stable tag: 4.8.5
 License: GPL-3.0-or-later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -72,6 +72,14 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 
 == Changelog ==
 
+= 4.8.5 - 2025-01-20 =
+* Fix - Unblock the Checkout page UI, and show a generic error when buyer verification fails.
+* Fix - Ensure inventory sync works correctly for variable products when Square sync is enabled through quick or bulk edit.
+* Dev - Bump WooCommerce "tested up to" version 9.6.
+* Dev - Bump WooCommerce minimum supported version to 9.4.
+* Dev - Use the `@woocommerce/e2e-utils-playwright` NPM package for E2E tests.
+* Dev - Updates GitHub `actions/cache`, `actions/upload` and `actions/download` to v4 due to deprecation.
+
 = 4.8.4 - 2024-12-09 =
 * Fix - Resolved the product duplication issue on the Square side when WooCommerce is set as the SOR.
 * Fix - Remove `woocommerce_loop_add_to_cart_link` filter to standardize "Buy Gift Card" and "Add to Cart" button styles across themes.

tests/e2e/specs/c4.product-import.spec.js

@@ -114,7 +114,6 @@ test( 'Handle missing products @sync', async ( { page } ) => {
 	await page.getByTestId( 'sync-settings-field' ).selectOption( { label: 'Square' } );
 	await page.getByTestId( 'hide-missing-products-field' ).check();
 	await saveSquareSettings( page );
-	await page.reload();
 
 	await page.goto( '/wp-admin/admin.php?page=wc-settings&tab=square&section=update' );
 	await page.locator( '#wc-square-sync' ).click();

woocommerce-square.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: WooCommerce Square
  * Requires Plugins: woocommerce
- * Version: 4.8.4
+ * Version: 4.8.5
  * Plugin URI: https://woocommerce.com/products/square/
  * Requires at least: 6.5
  * Tested up to: 6.7
@@ -29,7 +29,7 @@
 defined( 'ABSPATH' ) || exit;
 
 if ( ! defined( 'WC_SQUARE_PLUGIN_VERSION' ) ) {
-	define( 'WC_SQUARE_PLUGIN_VERSION', '4.8.4' ); // WRCS: DEFINED_VERSION.
+	define( 'WC_SQUARE_PLUGIN_VERSION', '4.8.5' ); // WRCS: DEFINED_VERSION.
 }
 
 if ( ! defined( 'WC_SQUARE_PLUGIN_URL' ) ) {