From 0a312f6a1ab723a9e4e3c0069f6ea18859f1c5f2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 06:31:46 +0000 Subject: [PATCH 1/4] Update version and add changelog entries for release 8.6.1 --- changelog.txt | 2 ++ changelog/update-server-container-name | 5 ----- package-lock.json | 4 ++-- package.json | 2 +- readme.txt | 5 ++++- woocommerce-payments.php | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 changelog/update-server-container-name diff --git a/changelog.txt b/changelog.txt index 969e9401b6c..0e404535b60 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,7 @@ *** WooPayments Changelog *** += 8.6.1 - 2024-12-17 = + = 8.6.0 - 2024-12-04 = * Add - Add Bank reference key column in Payout reports. This will help reconcile WooPayments Payouts with bank statements. * Add - Display credit card brand icons on order received page. diff --git a/changelog/update-server-container-name b/changelog/update-server-container-name deleted file mode 100644 index cb9580f8a22..00000000000 --- a/changelog/update-server-container-name +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: dev -Comment: Updates server container name used by E2E tests - - diff --git a/package-lock.json b/package-lock.json index 4d8d73b8e87..083ed1adf12 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "woocommerce-payments", - "version": "8.6.0", + "version": "8.6.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "woocommerce-payments", - "version": "8.6.0", + "version": "8.6.1", "hasInstallScript": true, "license": "GPL-3.0-or-later", "dependencies": { diff --git a/package.json b/package.json index 4fa803a245c..bbcb906489d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "woocommerce-payments", - "version": "8.6.0", + "version": "8.6.1", "main": "webpack.config.js", "author": "Automattic", "license": "GPL-3.0-or-later", diff --git a/readme.txt b/readme.txt index d67f01c3951..03917a00033 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: woocommerce payments, apple pay, credit card, google pay, payment, payment Requires at least: 6.0 Tested up to: 6.7 Requires PHP: 7.3 -Stable tag: 8.6.0 +Stable tag: 8.6.1 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -94,6 +94,9 @@ Please note that our support for the checkout block is still experimental and th == Changelog == += 8.6.1 - 2024-12-17 = + + = 8.6.0 - 2024-12-04 = * Add - Add Bank reference key column in Payout reports. This will help reconcile WooPayments Payouts with bank statements. * Add - Display credit card brand icons on order received page. diff --git a/woocommerce-payments.php b/woocommerce-payments.php index 19012d26053..9578b077742 100644 --- a/woocommerce-payments.php +++ b/woocommerce-payments.php @@ -11,7 +11,7 @@ * WC tested up to: 9.4.0 * Requires at least: 6.0 * Requires PHP: 7.3 - * Version: 8.6.0 + * Version: 8.6.1 * Requires Plugins: woocommerce * * @package WooCommerce\Payments From 940ea23b7e330258f64e12f1186390dc7820acc2 Mon Sep 17 00:00:00 2001 From: Daniel Guerra <15204776+danielmx-dev@users.noreply.github.com> Date: Thu, 12 Dec 2024 12:12:36 -0600 Subject: [PATCH 2/4] Skip mysqlcheck SSL Requirement during E2E environment setup (#9941) --- bin/docker-setup.sh | 4 ++-- changelog/fix-skip-ssl-requirement-env-setup | 4 ++++ tests/e2e/env/setup.sh | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 changelog/fix-skip-ssl-requirement-env-setup diff --git a/bin/docker-setup.sh b/bin/docker-setup.sh index 66c9fa1ee8b..6db41510908 100755 --- a/bin/docker-setup.sh +++ b/bin/docker-setup.sh @@ -27,11 +27,11 @@ cli() set +e # Wait for containers to be started up before the setup. # The db being accessible means that the db container started and the WP has been downloaded and the plugin linked -cli wp db check --path=/var/www/html --quiet > /dev/null +cli wp db check --skip_ssl --path=/var/www/html --quiet > /dev/null while [[ $? -ne 0 ]]; do echo "Waiting until the service is ready..." sleep 5 - cli wp db check --path=/var/www/html --quiet > /dev/null + cli wp db check --skip_ssl --path=/var/www/html --quiet > /dev/null done # If the plugin is already active then return early diff --git a/changelog/fix-skip-ssl-requirement-env-setup b/changelog/fix-skip-ssl-requirement-env-setup new file mode 100644 index 00000000000..691f98adbfa --- /dev/null +++ b/changelog/fix-skip-ssl-requirement-env-setup @@ -0,0 +1,4 @@ +Significance: minor +Type: fix + +Skip mysqlcheck SSL Requirement during E2E environment setup diff --git a/tests/e2e/env/setup.sh b/tests/e2e/env/setup.sh index d2aa3a50e89..5ab08183bac 100755 --- a/tests/e2e/env/setup.sh +++ b/tests/e2e/env/setup.sh @@ -123,11 +123,11 @@ step "Setting up CLIENT site" # Wait for containers to be started up before the setup. # The db being accessible means that the db container started and the WP has been downloaded and the plugin linked set +e -cli wp db check --path=/var/www/html --quiet > /dev/null +cli wp db check --skip_ssl --path=/var/www/html --quiet > /dev/null while [[ $? -ne 0 ]]; do echo "Waiting until the service is ready..." sleep 5 - cli wp db check --path=/var/www/html --quiet > /dev/null + cli wp db check --skip_ssl --path=/var/www/html --quiet > /dev/null done echo "Client DB is up and running..." set -e From ef9bd6cdf8d4d40555142d5e84b5a0f67b0c2e8f Mon Sep 17 00:00:00 2001 From: Daniel Guerra <15204776+danielmx-dev@users.noreply.github.com> Date: Tue, 17 Dec 2024 00:13:56 -0600 Subject: [PATCH 3/4] Checkout: Fix error when wc_address_i18n_params does not have data for a given country (#9974) --- changelog/fix-allow-addresses-from-woo-supported-countries | 4 ++++ client/checkout/classic/event-handlers.js | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 changelog/fix-allow-addresses-from-woo-supported-countries diff --git a/changelog/fix-allow-addresses-from-woo-supported-countries b/changelog/fix-allow-addresses-from-woo-supported-countries new file mode 100644 index 00000000000..626fd1ce34f --- /dev/null +++ b/changelog/fix-allow-addresses-from-woo-supported-countries @@ -0,0 +1,4 @@ +Significance: patch +Type: fix + +Checkout: Fix error when wc_address_i18n_params does not have data for a given country diff --git a/client/checkout/classic/event-handlers.js b/client/checkout/classic/event-handlers.js index fe53b9b2a88..95856896226 100644 --- a/client/checkout/classic/event-handlers.js +++ b/client/checkout/classic/event-handlers.js @@ -308,8 +308,8 @@ jQuery( function ( $ ) { if ( country && locale && fieldName !== 'billing_email' ) { const key = fieldName.replace( 'billing_', '' ); isRequired = - locale[ country ][ key ]?.required ?? - locale.default[ key ]?.required; + locale[ country ]?.[ key ]?.required ?? + locale.default?.[ key ]?.required; } const hasValue = $field?.value; From 96cec560b7c5c2ab941cbeb8b3d7c34cb987fb83 Mon Sep 17 00:00:00 2001 From: botwoo Date: Tue, 17 Dec 2024 08:20:37 +0000 Subject: [PATCH 4/4] Amend changelog entries for release 8.6.1 --- changelog.txt | 2 ++ changelog/fix-allow-addresses-from-woo-supported-countries | 4 ---- changelog/fix-skip-ssl-requirement-env-setup | 4 ---- readme.txt | 2 ++ 4 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 changelog/fix-allow-addresses-from-woo-supported-countries delete mode 100644 changelog/fix-skip-ssl-requirement-env-setup diff --git a/changelog.txt b/changelog.txt index 0e404535b60..cc6402cb77c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,8 @@ *** WooPayments Changelog *** = 8.6.1 - 2024-12-17 = +* Fix - Checkout: Fix error when wc_address_i18n_params does not have data for a given country +* Fix - Skip mysqlcheck SSL Requirement during E2E environment setup = 8.6.0 - 2024-12-04 = * Add - Add Bank reference key column in Payout reports. This will help reconcile WooPayments Payouts with bank statements. diff --git a/changelog/fix-allow-addresses-from-woo-supported-countries b/changelog/fix-allow-addresses-from-woo-supported-countries deleted file mode 100644 index 626fd1ce34f..00000000000 --- a/changelog/fix-allow-addresses-from-woo-supported-countries +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fix - -Checkout: Fix error when wc_address_i18n_params does not have data for a given country diff --git a/changelog/fix-skip-ssl-requirement-env-setup b/changelog/fix-skip-ssl-requirement-env-setup deleted file mode 100644 index 691f98adbfa..00000000000 --- a/changelog/fix-skip-ssl-requirement-env-setup +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: fix - -Skip mysqlcheck SSL Requirement during E2E environment setup diff --git a/readme.txt b/readme.txt index 03917a00033..0122e5021ae 100644 --- a/readme.txt +++ b/readme.txt @@ -95,6 +95,8 @@ Please note that our support for the checkout block is still experimental and th == Changelog == = 8.6.1 - 2024-12-17 = +* Fix - Checkout: Fix error when wc_address_i18n_params does not have data for a given country +* Fix - Skip mysqlcheck SSL Requirement during E2E environment setup = 8.6.0 - 2024-12-04 =