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

Base vs default

This commit is contained in:
Mike Jolley 2014-12-23 17:34:05 +00:00
parent 34413a1dd7
commit 6800ee0ec3
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/abstracts/abstract-wc-order.php
View File

@ -525,7 +525,7 @@ abstract class WC_Abstract_Order {
if ( 'base' === $tax_based_on ) {
$default = wc_get_default_location();
$default = wc_get_base_location();
$country = $default['country'];
$state = $default['state'];
$postcode = '';

12
includes/class-wc-countries.php
View File

@ -118,10 +118,8 @@ class WC_Countries {
* @return string
*/
public function get_base_country() {
$default = esc_attr( get_option('woocommerce_default_country') );
$country = ( ( $pos = strrpos( $default, ':' ) ) === false ) ? $default : substr( $default, 0, $pos );
return apply_filters( 'woocommerce_countries_base_country', $country );
$default = wc_get_base_location();
return apply_filters( 'woocommerce_countries_base_country', $default['country'] );
}
/**
@ -131,10 +129,8 @@ class WC_Countries {
* @return string
*/
public function get_base_state() {
$default = wc_clean( get_option( 'woocommerce_default_country' ) );
$state = ( ( $pos = strrpos( $default, ':' ) ) === false ) ? '' : substr( $default, $pos + 1 );
return apply_filters( 'woocommerce_countries_base_state', $state );
$default = wc_get_base_location();
return apply_filters( 'woocommerce_countries_base_state', $default['state'] );
}
/**