diff --git a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/style.scss b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/style.scss index 17fb4cb709c..5a4c67f7e64 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/style.scss +++ b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/style.scss @@ -88,6 +88,7 @@ $border-radius: 5px; .wc-block-components-express-payment__event-buttons { > li { + box-sizing: border-box; display: inline-block; width: 50%; } diff --git a/plugins/woocommerce-blocks/assets/js/editor-components/external-link-card/index.tsx b/plugins/woocommerce-blocks/assets/js/editor-components/external-link-card/index.tsx index 21c57081aca..3b0495cbf4f 100644 --- a/plugins/woocommerce-blocks/assets/js/editor-components/external-link-card/index.tsx +++ b/plugins/woocommerce-blocks/assets/js/editor-components/external-link-card/index.tsx @@ -5,7 +5,7 @@ import { __ } from '@wordpress/i18n'; import { Icon, external } from '@wordpress/icons'; import { VisuallyHidden } from '@wordpress/components'; import { sanitizeHTML } from '@woocommerce/utils'; -import { alert } from '@woocommerce/icons'; +import { Alert } from '@woocommerce/icons'; /** * Internal dependencies @@ -50,7 +50,7 @@ const ExternalLinkCard = ( { ) } { warning ? ( - + } /> { warning } ) : null } diff --git a/plugins/woocommerce-blocks/docs/internal-developers/testing/releases/963.md b/plugins/woocommerce-blocks/docs/internal-developers/testing/releases/963.md new file mode 100644 index 00000000000..de101bb3fd9 --- /dev/null +++ b/plugins/woocommerce-blocks/docs/internal-developers/testing/releases/963.md @@ -0,0 +1,22 @@ +# Testing notes and ZIP for release 9.6.3 + +Zip file for testing: [woocommerce-gutenberg-products-block.zip](https://github.com/woocommerce/woocommerce-blocks/files/10841107/woocommerce-gutenberg-products-block.zip) + + +## WooCommerce Core + +### Fix the Checkout Blocks "Payment Options" settings crash in the editor. ([8535](https://github.com/woocommerce/woocommerce-blocks/pull/8535)) + +1. Install and enable an incompatible payment gateway plugin with the `Cart` & `Checkout` Blocks. (e.g., [IDPay Payment Gateway for Woocommerce](https://wordpress.org/plugins/woo-idpay-gateway/)) +2. Create a new page and add the `Checkout` Block +3. Select the Checkout Block or any of its Inner Blocks (except for the `Payment Options` Inner Block). Ensure our incompatible payment gateway (e.g., IDPay) is listed under the incompatible gateways notice: + +image + +4. Select the `Payment Options` Inner Block. Ensure its settings are correctly displayed, the incompatible gateways notice is showing and our incompatible payment Gateway is highlighted under `Settings -> Block -> Methods` + +image + +| Before | After | +| ------ | ----- | +| image | image | diff --git a/plugins/woocommerce-blocks/docs/internal-developers/testing/releases/README.md b/plugins/woocommerce-blocks/docs/internal-developers/testing/releases/README.md index bb0227d9170..0b38a5033c7 100644 --- a/plugins/woocommerce-blocks/docs/internal-developers/testing/releases/README.md +++ b/plugins/woocommerce-blocks/docs/internal-developers/testing/releases/README.md @@ -121,6 +121,7 @@ Every release includes specific testing instructions for new features and bug fi - [9.6.0](./960.md) - [9.6.1](./961.md) - [9.6.2](./962.md) + - [9.6.3](./963.md) diff --git a/plugins/woocommerce-blocks/package.json b/plugins/woocommerce-blocks/package.json index 9b189182276..23af53a13ce 100644 --- a/plugins/woocommerce-blocks/package.json +++ b/plugins/woocommerce-blocks/package.json @@ -2,7 +2,7 @@ "name": "@woocommerce/block-library", "title": "WooCommerce Blocks", "author": "Automattic", - "version": "9.6.2", + "version": "9.6.3", "description": "WooCommerce blocks for the Gutenberg editor.", "homepage": "https://github.com/woocommerce/woocommerce-gutenberg-products-block/", "keywords": [ diff --git a/plugins/woocommerce-blocks/readme.txt b/plugins/woocommerce-blocks/readme.txt index f93191866b8..45bfd18c2b3 100644 --- a/plugins/woocommerce-blocks/readme.txt +++ b/plugins/woocommerce-blocks/readme.txt @@ -4,7 +4,7 @@ Tags: gutenberg, woocommerce, woo commerce, products, blocks, woocommerce blocks Requires at least: 6.1.1 Tested up to: 6.1.1 Requires PHP: 7.2 -Stable tag: 9.6.2 +Stable tag: 9.6.3 License: GPLv3 License URI: https://www.gnu.org/licenses/gpl-3.0.html @@ -80,6 +80,14 @@ Release and roadmap notes available on the [WooCommerce Developers Blog](https:/ == Changelog == += 9.6.3 - 2023-02-27 = + +#### Bug Fixes + +- Fix: Ensure that Express Payment buttons are visible next to each other. ([8548](https://github.com/woocommerce/woocommerce-blocks/pull/8548)) +- Check if session is set before returning updated customer address. ([8537](https://github.com/woocommerce/woocommerce-blocks/pull/8537)) +- Fix the Checkout Blocks "Payment Options" settings crash in the editor. ([8535](https://github.com/woocommerce/woocommerce-blocks/pull/8535)) + = 9.6.2 - 2023-02-22 = #### Bug Fixes diff --git a/plugins/woocommerce-blocks/src/Package.php b/plugins/woocommerce-blocks/src/Package.php index 00e1af36f1e..31c1a1848f7 100644 --- a/plugins/woocommerce-blocks/src/Package.php +++ b/plugins/woocommerce-blocks/src/Package.php @@ -109,7 +109,7 @@ class Package { NewPackage::class, function ( $container ) { // leave for automated version bumping. - $version = '9.6.2'; + $version = '9.6.3'; return new NewPackage( $version, dirname( __DIR__ ), diff --git a/plugins/woocommerce-blocks/src/Shipping/ShippingController.php b/plugins/woocommerce-blocks/src/Shipping/ShippingController.php index 2a20b91ea31..9735f04cc16 100644 --- a/plugins/woocommerce-blocks/src/Shipping/ShippingController.php +++ b/plugins/woocommerce-blocks/src/Shipping/ShippingController.php @@ -283,6 +283,10 @@ class ShippingController { * @return array */ public function filter_taxable_address( $address ) { + + if ( null === WC()->session ) { + return $address; + } // We only need to select from the first package, since pickup_location only supports a single package. $chosen_method = current( WC()->session->get( 'chosen_shipping_methods', array() ) ) ?? ''; $chosen_method_id = explode( ':', $chosen_method )[0]; diff --git a/plugins/woocommerce-blocks/woocommerce-gutenberg-products-block.php b/plugins/woocommerce-blocks/woocommerce-gutenberg-products-block.php index ad996c8c3df..beb66ba0762 100644 --- a/plugins/woocommerce-blocks/woocommerce-gutenberg-products-block.php +++ b/plugins/woocommerce-blocks/woocommerce-gutenberg-products-block.php @@ -3,7 +3,7 @@ * Plugin Name: WooCommerce Blocks * Plugin URI: https://github.com/woocommerce/woocommerce-gutenberg-products-block * Description: WooCommerce blocks for the Gutenberg editor. - * Version: 9.6.2 + * Version: 9.6.3 * Author: Automattic * Author URI: https://woocommerce.com * Text Domain: woo-gutenberg-products-block