Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reset state and postcode if it's not valid for the current country (#47369) 

* reset state if it's not valid for the current country

* reset postcode as well

* Add changefile(s) from automation for the following project(s): woocommerce

* update logic so its in Checkout block instead of store api

* fix linting

---------

Co-authored-by: github-actions <github-actions@github.com>
This commit is contained in:
Seghir Nadir 2024-05-13 16:46:08 +02:00 committed by GitHub
parent 98510fe9fd
commit b256336176
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/form/form.tsx
View File

@ -1,7 +1,6 @@
/**
* External dependencies
*/
import { isPostcode } from '@woocommerce/blocks-checkout';
import {
ValidatedTextInput,
type ValidatedTextInputHandle,
@ -164,22 +163,12 @@ const Form = < T extends AddressFormValues | ContactFormValues >( {
{ ...fieldProps }
value={ values.country }
onChange={ ( newCountry ) => {
const newValues = {
onChange( {
...values,
country: newCountry,
state: '',
};
// Country will impact postcode too. Do we need to clear it?
if (
values.postcode &&
! isPostcode( {
postcode: values.postcode,
country: newCountry,
} )
) {
newValues.postcode = '';
}
onChange( newValues );
postcode: '',
} );
} }
/>
);

34
plugins/woocommerce-blocks/assets/js/data/cart/push-changes.ts
View File

@ -68,6 +68,40 @@ const updateDirtyProps = () => {
// Update local cache of customer data so the next time this runs, it can compare against the latest data.
localState.customerData = newCustomerData;
const dirtyShippingAddress = localState.dirtyProps.shippingAddress;
const dirtyBillingAddress = localState.dirtyProps.billingAddress;
const customerShippingAddress = localState.customerData.shippingAddress;
const customerBillingAddress = localState.customerData.billingAddress;
// Check if country is changing without state
const shippingCountryChanged = dirtyShippingAddress.includes( 'country' );
const billingCountryChanged = dirtyBillingAddress.includes( 'country' );
const shippingStateChanged = dirtyShippingAddress.includes( 'state' );
const billingStateChanged = dirtyBillingAddress.includes( 'state' );
const shippingPostcodeChanged = dirtyShippingAddress.includes( 'postcode' );
const billingPostcodeChanged = dirtyBillingAddress.includes( 'postcode' );
if ( shippingCountryChanged && ! shippingPostcodeChanged ) {
dirtyShippingAddress.push( 'postcode' );
customerShippingAddress.postcode = '';
}
if ( billingCountryChanged && ! billingPostcodeChanged ) {
dirtyBillingAddress.push( 'postcode' );
customerBillingAddress.postcode = '';
}
if ( shippingCountryChanged && ! shippingStateChanged ) {
dirtyShippingAddress.push( 'state' );
customerShippingAddress.state = '';
}
if ( billingCountryChanged && ! billingStateChanged ) {
dirtyBillingAddress.push( 'state' );
customerBillingAddress.state = '';
}
};
/**

4
plugins/woocommerce/changelog/47369-fix-state-flickring-when-switching-countries Normal file
View File

@ -0,0 +1,4 @@
Significance: patch
Type: fix
Correctly clear out state and postcode when switching countries.

17
plugins/woocommerce/src/StoreApi/Routes/V1/CartUpdateCustomer.php
View File

@ -240,21 +240,8 @@ class CartUpdateCustomer extends AbstractCartRoute {
* @return array
*/
protected function get_customer_billing_address( \WC_Customer $customer ) {
$validation_util = new ValidationUtils();
$billing_country = $customer->get_billing_country();
$billing_state = $customer->get_billing_state();
$additional_fields = $this->additional_fields_controller->get_all_fields_from_object( $customer, 'billing' );
/**
* There's a bug in WooCommerce core in which not having a state ("") would result in us validating against the store's state.
* This resets the state to an empty string if it doesn't match the country.
*
* @todo Removing this handling once we fix the issue with the state value always being the store one.
*/
if ( ! $validation_util->validate_state( $billing_state, $billing_country ) ) {
$billing_state = '';
}
return array_merge(
[
'first_name' => $customer->get_billing_first_name(),
@ -263,9 +250,9 @@ class CartUpdateCustomer extends AbstractCartRoute {
'address_1' => $customer->get_billing_address_1(),
'address_2' => $customer->get_billing_address_2(),
'city' => $customer->get_billing_city(),
'state' => $billing_state,
'state' => $customer->get_billing_state(),
'postcode' => $customer->get_billing_postcode(),
'country' => $billing_country,
'country' => $customer->get_billing_country(),
'phone' => $customer->get_billing_phone(),
'email' => $customer->get_billing_email(),
],

6
plugins/woocommerce/src/StoreApi/Schemas/V1/AbstractAddressSchema.php
View File

@ -123,7 +123,7 @@ abstract class AbstractAddressSchema extends AbstractSchema {
$address = array_intersect_key( $address, $field_schema );
$address = array_reduce(
array_keys( $address ),
function( $carry, $key ) use ( $address, $validation_util, $field_schema ) {
function ( $carry, $key ) use ( $address, $validation_util, $field_schema ) {
switch ( $key ) {
case 'country':
$carry[ $key ] = wc_strtoupper( sanitize_text_field( wp_unslash( $address[ $key ] ) ) );
@ -281,7 +281,7 @@ abstract class AbstractAddressSchema extends AbstractSchema {
$address_fields = array_filter(
$fields,
function( $key ) use ( $additional_fields_keys ) {
function ( $key ) use ( $additional_fields_keys ) {
return in_array( $key, $additional_fields_keys, true );
},
ARRAY_FILTER_USE_KEY
@ -298,7 +298,7 @@ abstract class AbstractAddressSchema extends AbstractSchema {
if ( 'select' === $field['type'] ) {
$field_schema['enum'] = array_map(
function( $option ) {
function ( $option ) {
return $option['value'];
},
$field['options']