Bug #59571: sync billing address values in blocks checkout

Author: JerrySmidt

build/shipping-address-autocomplete-intl-frontend.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wc-blocks-checkout', 'wc-blocks-components', 'wc-blocks-data-store', 'wc-settings', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '7f123088717075ee9ec5');
+<?php return array('dependencies' => array('react', 'wc-blocks-checkout', 'wc-blocks-components', 'wc-blocks-data-store', 'wc-settings', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '5b3237eb895ec83977a0');

build/shipping-address-autocomplete-intl-frontend.js

@@ -3,7 +3,7 @@
  * Plugin Name: Postcode.eu Address Validation
  * Plugin URI: https://www.postcode.eu/products/address-api/implementation
  * Description: Address autocomplete and validation using the Postcode.eu API.
- * Version: 2.4.0
+ * Version: 2.4.1
  * Author: Postcode.nl
  * Author URI: https://www.postcode.nl
  * License: FreeBSD license

postcode-eu-address-validation.php

@@ -1,7 +1,7 @@
 === Postcode.eu Address Validation ===
 Contributors: postcodenl
 Tags: address validation, address autocomplete, postcode api, address api, postcode check
-Stable tag: 2.4.0
+Stable tag: 2.4.1
 Tested up to: 6.7
 License: FreeBSD license
 License URI: https://directory.fsf.org/wiki/License:BSD-2-Clause-FreeBSD
@@ -86,6 +86,9 @@ For more details on the Postcode.eu API and how to obtain an account, please vis
 
 == Changelog ==
 
+= 2.4.1 =
+* Fixed billing address values not synced from shipping address with use-shipping-as-billing option enabled.
+
 = 2.4.0 =
 * Add support for blocks checkout. Note that this currently only works with the single address input field. Autocomplete based on Dutch postcode and house number will be supported in a future version.
 

readme.txt

@@ -11,7 +11,7 @@
 class Main
 {
 	/** @var string The version number of the plugin should be equal to the commented version number in ../../../postcode-eu-address-validation.php */
-	public const VERSION = '2.4.0';
+	public const VERSION = '2.4.1';
 
 	/** @var string Path to the plugin directory */
 	public static $pluginDirPath;

src/PostcodeNl/AddressAutocomplete/Main.php

@@ -3,7 +3,7 @@ import { CART_STORE_KEY, CHECKOUT_STORE_KEY } from '@woocommerce/block-data';
 import AutocompleteContainer from '../../components/address-autocomplete-intl/container';
 
 const Block = () => {
-	const useShippingAsBilling = useSelect(select => select(CHECKOUT_STORE_KEY).getUseShippingAsBilling() , []),
+	const useShippingAsBilling = useSelect(select => select(CHECKOUT_STORE_KEY).getUseShippingAsBilling(), []),
 		{billingAddress} = useSelect(select => select(CART_STORE_KEY).getCustomerData(), []),
 		{setBillingAddress} = useDispatch(CART_STORE_KEY);
 

src/blocks/billing-address-autocomplete-intl/block.js

@@ -1,10 +1,21 @@
 import { useSelect, useDispatch } from '@wordpress/data';
+import { useEffect } from '@wordpress/element';
 import { CART_STORE_KEY } from '@woocommerce/block-data';
+import { CHECKOUT_STORE_KEY } from '@woocommerce/block-data';
 import AutocompleteContainer from '../../components/address-autocomplete-intl/container';
 
 const Block = () => {
-	const {shippingAddress} = useSelect(select => select(CART_STORE_KEY).getCustomerData(), []),
-		{setShippingAddress} = useDispatch(CART_STORE_KEY);
+	const useShippingAsBilling = useSelect(select => select(CHECKOUT_STORE_KEY).getUseShippingAsBilling(), []),
+		{shippingAddress} = useSelect(select => select(CART_STORE_KEY).getCustomerData(), []),
+		{setShippingAddress, setBillingAddress} = useDispatch(CART_STORE_KEY);
+
+	useEffect(() => {
+		if (useShippingAsBilling)
+		{
+			// Billing address needs to be synced with shipping address after calling `setShippingAddress`.
+			setBillingAddress({...shippingAddress});
+		}
+	}, [shippingAddress]);
 
 	return (
 		<AutocompleteContainer