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

remove changed

This commit is contained in:
Mike Jolley 2016-08-31 13:25:13 +01:00
parent 62d0619b1a
commit 1595cc5767
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,12 +90,6 @@ class WC_Customer extends WC_Legacy_Customer {
*/ */
protected $_meta_type = 'user'; protected $_meta_type = 'user';
/**
* Was data changed in the database for this class?
* @var boolean
*/
protected $_changed = false;
/** /**
* If this is the customer session, this is true. When true, guest accounts will not be saved to the DB. * If this is the customer session, this is true. When true, guest accounts will not be saved to the DB.
* @var boolean * @var boolean
@ -136,17 +130,7 @@ class WC_Customer extends WC_Legacy_Customer {
if ( $is_session ) { if ( $is_session ) {
$this->_is_session = true; $this->_is_session = true;
$this->load_session(); $this->load_session();
add_action( 'shutdown', array( $this, 'save_session_if_changed' ), 10 ); add_action( 'shutdown', array( $this, 'save_to_session' ), 10 );
}
}
/**
* Saves customer information to the current session if any data changed.
* @since 2.7.0
*/
public function save_session_if_changed() {
if ( $this->_changed ) {
$this->save_to_session();
} }
} }
@ -1030,7 +1014,7 @@ class WC_Customer extends WC_Legacy_Customer {
public function set_calculated_shipping( $calculated = true ) { public function set_calculated_shipping( $calculated = true ) {
$this->_calculated_shipping = (bool) $calculated; $this->_calculated_shipping = (bool) $calculated;
} }
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| CRUD methods | CRUD methods
@ -1201,7 +1185,7 @@ class WC_Customer extends WC_Legacy_Customer {
*/ */
public function save() { public function save() {
if ( $this->_is_session ) { if ( $this->_is_session ) {
$this->save_session_if_changed(); $this->save_to_session();
} elseif ( ! $this->get_id() ) { } elseif ( ! $this->get_id() ) {
$this->create(); $this->create();
} else { } else {
@ -1222,7 +1206,9 @@ class WC_Customer extends WC_Legacy_Customer {
} }
$data[ $session_key ] = $this->{"get_$function_key"}(); $data[ $session_key ] = $this->{"get_$function_key"}();
} }
WC()->session->set( 'customer', $data ); if ( $data !== WC()->session->get( 'customer' ) ) {
WC()->session->set( 'customer', $data );
}
} }
} }

21
includes/legacy/class-wc-legacy-customer.php
View File

@ -39,7 +39,7 @@ abstract class WC_Legacy_Customer extends WC_Data {
if ( in_array( $key, array( 'country', 'state', 'postcode' ,'city', 'address_1', 'address', 'address_2' ) ) ) { if ( in_array( $key, array( 'country', 'state', 'postcode' ,'city', 'address_1', 'address', 'address_2' ) ) ) {
$key = 'billing_' . $key; $key = 'billing_' . $key;
} }
return isset( $this->_data[ $key ] ) ? $this->_data[ $key ] : ''; return is_callable( $this, "get_{$key}" ) ? $this->{"get_{$key}"}() : '';
} }
/** /**
@ -51,8 +51,10 @@ abstract class WC_Legacy_Customer extends WC_Data {
public function __set( $key, $value ) { public function __set( $key, $value ) {
_doing_it_wrong( $key, 'Customer properties should not be set directly.', '2.7' ); _doing_it_wrong( $key, 'Customer properties should not be set directly.', '2.7' );
$key = $this->filter_legacy_key( $key ); $key = $this->filter_legacy_key( $key );
$this->_data[ $key ] = $value;
$this->_changed = true; if ( is_callable( $this, "set_{$key}" ) ) {
$this->{"set_{$key}"}( $value );
}
} }
/** /**
@ -72,6 +74,19 @@ abstract class WC_Legacy_Customer extends WC_Data {
return $key; return $key;
} }
/**
* Sets session data for the location.
*
* @param string $country
* @param string $state
* @param string $postcode (default: '')
* @param string $city (default: '')
*/
public function set_location( $country, $state, $postcode = '', $city = '' ) {
$this->set_billing_location( $country, $state, $postcode, $city );
$this->set_shipping_location( $country, $state, $postcode, $city );
}
/** /**
* Get default country for a customer. * Get default country for a customer.
* @return string * @return string