fix analytics settings

This commit is contained in:
Mike Jolley 2012-05-11 21:41:18 +01:00
parent aa2bf617ab
commit 12f9241162
2 changed files with 8 additions and 7 deletions

View File

@ -45,20 +45,20 @@ class WC_Google_Analytics extends WC_Integration {
'title' => __('Google Analytics ID', 'woocommerce'),
'description' => __('Log into your google analytics account to find your ID. e.g. <code>UA-XXXXX-X</code>', 'woocommerce'),
'type' => 'text',
'default' => get_option('woocommerce_ga_id')
'default' => get_option('woocommerce_ga_id') // Backwards compat
),
'ga_standard_tracking_enabled' => array(
'title' => __('Tracking code', 'woocommerce'),
'label' => __('Add tracking code to your site\'s footer. You don\'t need to enable this if using a 3rd party analytics plugin.', 'woocommerce'),
'type' => 'checkbox',
'checkboxgroup' => 'start',
'default' => get_option('woocommerce_ga_standard_tracking_enabled') ? get_option('woocommerce_ga_standard_tracking_enabled') : 'no'
'default' => get_option('woocommerce_ga_standard_tracking_enabled') ? get_option('woocommerce_ga_standard_tracking_enabled') : 'no' // Backwards compat
),
'ga_ecommerce_tracking_enabled' => array(
'label' => __('Add eCommerce tracking code to the thankyou page', 'woocommerce'),
'type' => 'checkbox',
'checkboxgroup' => 'end',
'default' => get_option('woocommerce_ga_ecommerce_tracking_enabled') ? get_option('woocommerce_ga_ecommerce_tracking_enabled') : 'no'
'default' => get_option('woocommerce_ga_ecommerce_tracking_enabled') ? get_option('woocommerce_ga_ecommerce_tracking_enabled') : 'no' // Backwards compat
)
);
@ -70,9 +70,9 @@ class WC_Google_Analytics extends WC_Integration {
function google_tracking_code() {
global $woocommerce;
if ( is_admin() || current_user_can('manage_options') || get_option('woocommerce_ga_standard_tracking_enabled') == "no" ) return;
if ( is_admin() || current_user_can('manage_options') || $this->ga_standard_tracking_enabled == "no" ) return;
$tracking_id = get_option('woocommerce_ga_id');
$tracking_id = $this->ga_id;
if ( ! $tracking_id ) return;
@ -113,9 +113,9 @@ class WC_Google_Analytics extends WC_Integration {
function ecommerce_tracking_code( $order_id ) {
global $woocommerce;
if ( is_admin() || current_user_can('manage_options') || get_option('woocommerce_ga_ecommerce_tracking_enabled') == "no" ) return;
if ( is_admin() || current_user_can('manage_options') || $this->ga_ecommerce_tracking_enabled == "no" ) return;
$tracking_id = get_option('woocommerce_ga_id');
$tracking_id = $this->ga_id;
if ( ! $tracking_id ) return;

View File

@ -151,6 +151,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
* Tweak - When the count of available shipping methods changes, reset to default
* Tweak - Optimisations to monthly and product reports
* Tweak - Individually sold variation handling
* Fix - Google Analytics options fix
= 1.5.5 - 10/05/2012 =
* Feature - New 'default' sorting order using menu_order, with drag and drop sorting (based on http://wordpress.org/extend/plugins/simple-page-ordering/)