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

Don't mix session and customer data

This commit is contained in:
Mike Jolley 2019-01-15 16:49:01 +00:00
parent 2dbdc9d356
commit f68a547f53
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
includes/class-wc-customer.php
View File

@ -137,7 +137,8 @@ class WC_Customer extends WC_Legacy_Customer {
public function delete_and_reassign( $reassign = null ) {
if ( $this->data_store ) {
$this->data_store->delete(
$this, array(
$this,
array(
'force_delete' => true,
'reassign' => $reassign,
)
@ -817,12 +818,16 @@ class WC_Customer extends WC_Legacy_Customer {
* @param string $city City.
*/
public function set_billing_location( $country, $state = '', $postcode = '', $city = '' ) {
$billing = $this->get_prop( 'billing', 'edit' );
$billing['country'] = $country;
$billing['state'] = $state;
$billing['postcode'] = $postcode;
$billing['city'] = $city;
$this->set_prop( 'billing', $billing );
$address_data = $this->get_prop( 'billing', 'edit' );
$address_data['address_1'] = '';
$address_data['address_2'] = '';
$address_data['city'] = $city;
$address_data['state'] = $state;
$address_data['postcode'] = $postcode;
$address_data['country'] = $country;
$this->set_prop( 'billing', $address_data );
}
/**
@ -834,12 +839,16 @@ class WC_Customer extends WC_Legacy_Customer {
* @param string $city City.
*/
public function set_shipping_location( $country, $state = '', $postcode = '', $city = '' ) {
$shipping = $this->get_prop( 'shipping', 'edit' );
$shipping['country'] = $country;
$shipping['state'] = $state;
$shipping['postcode'] = $postcode;
$shipping['city'] = $city;
$this->set_prop( 'shipping', $shipping );
$address_data = $this->get_prop( 'shipping', 'edit' );
$address_data['address_1'] = '';
$address_data['address_2'] = '';
$address_data['city'] = $city;
$address_data['state'] = $state;
$address_data['postcode'] = $postcode;
$address_data['country'] = $country;
$this->set_prop( 'shipping', $address_data );
}
/**

2
includes/data-stores/class-wc-customer-data-store-session.php
View File

@ -109,7 +109,7 @@ class WC_Customer_Data_Store_Session extends WC_Data_Store_WP implements WC_Cust
if ( 'billing_' === substr( $session_key, 0, 8 ) ) {
$session_key = str_replace( 'billing_', '', $session_key );
}
if ( ! empty( $data[ $session_key ] ) && is_callable( array( $customer, "set_{$function_key}" ) ) ) {
if ( isset( $data[ $session_key ] ) && is_callable( array( $customer, "set_{$function_key}" ) ) ) {
$customer->{"set_{$function_key}"}( wp_unslash( $data[ $session_key ] ) );
}
}

2
includes/shortcodes/class-wc-shortcode-cart.php
View File

@ -40,7 +40,7 @@ class WC_Shortcode_Cart {
}
if ( $address['country'] ) {
WC()->customer->set_location( $address['country'], $address['state'], $address['postcode'], $address['city'] );
WC()->customer->set_billing_location( $address['country'], $address['state'], $address['postcode'], $address['city'] );
WC()->customer->set_shipping_location( $address['country'], $address['state'], $address['postcode'], $address['city'] );
} else {
WC()->customer->set_billing_address_to_base();