Skip to content

Commit eef95ae

Browse files
committed
Bug #61049: Fix autocomplete missing from billing address when using pickup delivery
1 parent 3fcc528 commit eef95ae

8 files changed

Lines changed: 15 additions & 14 deletions
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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', 'wp-primitives'), 'version' => '71d339c7fcea29d9d9f8');
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', 'wp-primitives'), 'version' => '91fb91b5eeb4ea3088a7');

build/billing-address-autocomplete-frontend.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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', 'wp-primitives'), 'version' => '2d6cc5a79bac8a679a64');
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', 'wp-primitives'), 'version' => 'af165f07d0506cfdb410');

build/shipping-address-autocomplete-frontend.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

postcode-eu-address-validation.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
* Plugin Name: Postcode.eu Address Validation
44
* Plugin URI: https://www.postcode.eu/products/address-api/implementation
55
* Description: Address autocomplete and validation using the Postcode.eu API.
6-
* Version: 2.7.0
6+
* Version: 2.7.1
77
* Author: Postcode.nl
88
* Author URI: https://www.postcode.nl
99
* License: FreeBSD license
1010
* License URI: https://directory.fsf.org/wiki/License:BSD-2-Clause-FreeBSD
1111
* Text Domain: postcode-eu-address-validation
1212
* Requires at least: 5.2
13-
* Tested up to: 6.8
13+
* Tested up to: 6.9
1414
* Requires PHP: 7.4
1515
* WC requires at least: 8.5
16-
* WC tested up to: 10.2
16+
* WC tested up to: 10.5
1717
*/
1818

1919
use Automattic\WooCommerce\Utilities\FeaturesUtil;

readme.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
=== Postcode.eu Address Validation ===
22
Contributors: postcodenl
33
Tags: address validation, address autocomplete, postcode api, address api, postcode check
4-
Stable tag: 2.7.0
5-
Tested up to: 6.8
4+
Stable tag: 2.7.1
5+
Tested up to: 6.9
66
License: FreeBSD license
77
License URI: https://directory.fsf.org/wiki/License:BSD-2-Clause-FreeBSD
88

@@ -86,6 +86,9 @@ For more details on the Postcode.eu API and how to obtain an account, please vis
8686

8787
== Changelog ==
8888

89+
= 2.7.1 =
90+
* Fix autocomplete missing from billing address when using pickup delivery.
91+
8992
= 2.7.0 =
9093
* Add option to disallow PO boxes.
9194
* Add debug information viewer to admin page.

src/PostcodeNl/AddressAutocomplete/Main.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Main
1414
public const NAME = 'Postcode.eu Address Validation';
1515

1616
/** @var string The version number of the plugin should be equal to the commented version number in ../../../postcode-eu-address-validation.php */
17-
public const VERSION = '2.7.0';
17+
public const VERSION = '2.7.1';
1818

1919
/** @var string Script handle of the autocomplete library. */
2020
public const AUTOCOMPLETE_LIBRARY_HANDLE = 'postcode-eu-autocomplete-address-library';

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
import { useSelect, useDispatch } from '@wordpress/data';
22
import { CART_STORE_KEY, CHECKOUT_STORE_KEY } from '@woocommerce/block-data';
3-
import { getSetting } from '@woocommerce/settings';
43
import AutocompleteBlock from '../../components/address-autocomplete/block';
54

65
const Block = () => {
7-
const {isUseShippingAsBilling, isEditingAddress} = useSelect((select) => ({
8-
isUseShippingAsBilling: select(CHECKOUT_STORE_KEY).getUseShippingAsBilling(),
6+
const {isEditingAddress} = useSelect((select) => ({
97
isEditingAddress: select(CHECKOUT_STORE_KEY).getEditingBillingAddress(),
108
}), []),
119
{setEditingBillingAddress} = useDispatch(CHECKOUT_STORE_KEY),
1210
{billingAddress} = useSelect(select => select(CART_STORE_KEY).getCustomerData(), []),
1311
{setBillingAddress} = useDispatch(CART_STORE_KEY);
1412

15-
return (isUseShippingAsBilling && !getSetting('forcedBillingAddress')) ? null : (
13+
return (
1614
<AutocompleteBlock
1715
addressType='billing'
1816
address={billingAddress}

0 commit comments

Comments
 (0)