diff --git a/classes/class-wc-order.php b/classes/class-wc-order.php index c577a51dc73..cf4a556523c 100644 --- a/classes/class-wc-order.php +++ b/classes/class-wc-order.php @@ -260,21 +260,21 @@ class WC_Order { /** Gets shipping and product tax */ function get_total_tax() { - return apply_filters( 'woocommerce_order_amount_total_tax', $this->order_tax + $this->order_shipping_tax ); + return apply_filters( 'woocommerce_order_amount_total_tax', number_format( $this->order_tax + $this->order_shipping_tax, 2, '.', '' ) ); } /** * gets the total (product) discount amount - these are applied before tax */ function get_cart_discount() { - return apply_filters( 'woocommerce_order_amount_cart_discount', $this->cart_discount ); + return apply_filters( 'woocommerce_order_amount_cart_discount', number_format( $this->cart_discount, 2, '.', '' ) ); } /** * gets the total (product) discount amount - these are applied before tax */ function get_order_discount() { - return apply_filters( 'woocommerce_order_amount_order_discount', $this->order_discount ); + return apply_filters( 'woocommerce_order_amount_order_discount', number_format( $this->order_discount, 2, '.', '' ) ); } /** @@ -282,18 +282,18 @@ class WC_Order { */ function get_total_discount() { if ($this->order_discount || $this->cart_discount) : - return apply_filters( 'woocommerce_order_amount_total_discount', $this->order_discount + $this->cart_discount ); + return apply_filters( 'woocommerce_order_amount_total_discount', number_format( $this->order_discount + $this->cart_discount, 2, '.', '' ) ); endif; } /** Gets shipping */ function get_shipping() { - return apply_filters( 'woocommerce_order_amount_shipping', $this->order_shipping ); + return apply_filters( 'woocommerce_order_amount_shipping', number_format( $this->order_shipping, 2, '.', '' ) ); } /** Gets shipping tax amount */ function get_shipping_tax() { - return apply_filters( 'woocommerce_order_amount_shipping_tax', $this->order_shipping_tax ); + return apply_filters( 'woocommerce_order_amount_shipping_tax', number_format( $this->order_shipping_tax, 2, '.', '' ) ); } /** Gets shipping method title */ @@ -303,7 +303,7 @@ class WC_Order { /** Gets order total */ function get_total() { - return apply_filters( 'woocommerce_order_amount_total', $this->order_total ); + return apply_filters( 'woocommerce_order_amount_total', number_format( $this->order_total, 2, '.', '' ) ); } /** Get item subtotal - this is the cost before discount */ @@ -359,7 +359,7 @@ class WC_Order { /** Deprecated functions */ function get_order_total() { - return apply_filters( 'woocommerce_order_amount_total', $this->order_total ); + return $this->get_total(); } function get_item_cost( $item, $inc_tax = false ) { diff --git a/classes/class-wc-product.php b/classes/class-wc-product.php index 8d3736249d5..3ecfe3d8880 100644 --- a/classes/class-wc-product.php +++ b/classes/class-wc-product.php @@ -1121,7 +1121,7 @@ class WC_Product { $attachment = wp_get_attachment_image_src( $attachment_id, 'full' ); $image_link = $attachment ? current( $attachment ) : ''; - + $image_title = get_the_title( $attachment_id ); } else { $image = $image_link = $image_title = ''; @@ -1239,8 +1239,6 @@ class WC_Product { function variable_product_sync() { global $woocommerce; - if (!$this->is_type('variable')) return; - $children = get_posts( array( 'post_parent' => $this->id, 'posts_per_page'=> -1, @@ -1280,8 +1278,7 @@ class WC_Product { $this->price = $this->min_variation_price; - if ( $this->min_variation_price !== '' ) - $woocommerce->clear_product_transients( $this->id ); + $woocommerce->clear_product_transients( $this->id ); } } diff --git a/classes/integrations/google-analytics/class-wc-google-analytics.php b/classes/integrations/google-analytics/class-wc-google-analytics.php index e807868e261..7842138bd04 100644 --- a/classes/integrations/google-analytics/class-wc-google-analytics.php +++ b/classes/integrations/google-analytics/class-wc-google-analytics.php @@ -1,7 +1,7 @@ id = 'google_analytics'; $this->method_title = __( 'Google Analytics', 'woocommerce' ); $this->method_description = __( 'Google Analytics is a free service offered by Google that generates detailed statistics about the visitors to a website.', 'woocommerce' ); - + // Load the form fields. $this->init_form_fields(); - + // Load the settings. $this->init_settings(); @@ -27,32 +27,32 @@ class WC_Google_Analytics extends WC_Integration { $this->ga_standard_tracking_enabled = $this->settings['ga_standard_tracking_enabled']; $this->ga_ecommerce_tracking_enabled = $this->settings['ga_ecommerce_tracking_enabled']; $this->ga_event_tracking_enabled = $this->settings['ga_event_tracking_enabled']; - + // Actions add_action( 'woocommerce_update_options_integration_google_analytics', array( &$this, 'process_admin_options') ); - + // Tracking code add_action( 'wp_footer', array( &$this, 'google_tracking_code' ) ); add_action( 'woocommerce_thankyou', array( &$this, 'ecommerce_tracking_code' ) ); - + // Event tracking code add_action( 'woocommerce_after_add_to_cart_button', array( &$this, 'add_to_cart' ) ); add_action( 'woocommerce_after_shop_loop', array( &$this, 'loop_add_to_cart' ) ); - } - + } + /** * Initialise Settings Form Fields */ function init_form_fields() { - - $this->form_fields = array( - 'ga_id' => array( + + $this->form_fields = array( + 'ga_id' => array( 'title' => __('Google Analytics ID', 'woocommerce'), 'description' => __('Log into your google analytics account to find your ID. e.g. UA-XXXXX-X', 'woocommerce'), 'type' => 'text', 'default' => get_option('woocommerce_ga_id') // Backwards compat ), - 'ga_standard_tracking_enabled' => array( + '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', @@ -72,21 +72,21 @@ class WC_Google_Analytics extends WC_Integration { 'default' => 'no' ) ); - + } // End init_form_fields() - + /** * Google Analytics standard tracking **/ function google_tracking_code() { global $woocommerce; - + if ( is_admin() || current_user_can('manage_options') || $this->ga_standard_tracking_enabled == "no" ) return; - + $tracking_id = $this->ga_id; - + if ( ! $tracking_id ) return; - + $loggedin = ( is_user_logged_in() ) ? 'yes' : 'no'; if ( is_user_logged_in() ) { $user_id = get_current_user_id(); @@ -96,9 +96,9 @@ class WC_Google_Analytics extends WC_Integration { $user_id = ''; $username = __('Guest', 'woocommerce'); } - - $woocommerce->add_inline_js(" - + + echo ""; } - + /** * Google Analytics eCommerce tracking **/ function ecommerce_tracking_code( $order_id ) { global $woocommerce; - - if ( is_admin() || current_user_can('manage_options') || $this->ga_ecommerce_tracking_enabled == "no" ) return; - + + if ( $this->ga_ecommerce_tracking_enabled == "no" || current_user_can('manage_options') ) + return; + $tracking_id = $this->ga_id; - + if ( ! $tracking_id ) return; - + // Doing eCommerce tracking so unhook standard tracking from the footer - remove_action('wp_footer', array( &$this, 'google_tracking_code' ) ); - + remove_action( 'wp_footer', array( &$this, 'google_tracking_code' ) ); + // Get the order and output tracking code - $order = new WC_Order($order_id); - - $loggedin = (is_user_logged_in()) ? 'yes' : 'no'; - if (is_user_logged_in()) { + $order = new WC_Order( $order_id ); + + $loggedin = is_user_logged_in() ? 'yes' : 'no'; + + if ( is_user_logged_in() ) { $user_id = get_current_user_id(); $current_user = get_user_by('id', $user_id); $username = $current_user->user_login; @@ -144,10 +146,10 @@ class WC_Google_Analytics extends WC_Integration { $user_id = ''; $username = __('Guest', 'woocommerce'); } - + $code = " var _gaq = _gaq || []; - + _gaq.push( ['_setAccount', '" . $tracking_id . "'], ['_setCustomVar', 1, 'logged-in', '" . $loggedin . "', 1], @@ -155,11 +157,11 @@ class WC_Google_Analytics extends WC_Integration { ['_setCustomVar', 3, 'username', '" . $username . "', 1], ['_trackPageview'] ); - + _gaq.push(['_addTrans', '" . $order_id . "', // order ID - required '" . get_bloginfo( 'name' ) . "', // affiliation or store name - '" . $order->order_total . "', // total - required + '" . $order->get_total() . "', // total - required '" . $order->get_total_tax() . "', // tax '" . $order->get_shipping() . "', // shipping '" . $order->billing_city . "', // city @@ -167,21 +169,21 @@ class WC_Google_Analytics extends WC_Integration { '" . $order->billing_country . "' // country ]); "; - + // Order items if ( $order->get_items() ) { foreach ( $order->get_items() as $item ) { $_product = $order->get_product_from_item( $item ); - + $code .= "_gaq.push(['_addItem',"; $code .= "'" . $order_id . "',"; - $code .= "'" . ( ( ! empty( $_product->sku ) ) ? __('SKU:', 'woocommerce') . ' ' . $_product->sku : $_product->id ) . "',"; + $code .= "'" . ( $_product->get_sku() ? __('SKU:', 'woocommerce') . ' ' . $_product->get_sku() : $_product->id ) . "',"; $code .= "'" . $item['name'] . "',"; - + if ( isset( $_product->variation_data ) ) { - + $code .= "'" . woocommerce_get_formatted_variation( $_product->variation_data, true ) . "',"; - + } else { $out = array(); $categories = get_the_terms($_product->id, 'product_cat'); @@ -193,86 +195,86 @@ class WC_Google_Analytics extends WC_Integration { $code .= "'" . join( "/", $out) . "',"; } - $code .= "'" . ( $item['line_total'] / $item['qty'] ) . "',"; + $code .= "'" . $order->get_item_total( $item ) . "',"; $code .= "'" . $item['qty'] . "'"; $code .= "]);"; } } - + $code .= " _gaq.push(['_trackTrans']); // submits transaction to the Analytics servers - + (function() { var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); "; - - $woocommerce->add_inline_js( $code ); + + echo ''; } - + /** * Google Analytics event tracking for single product add to cart * **/ function add_to_cart() { - + if ( $this->disable_tracking( $this->ga_event_tracking_enabled ) ) return; if ( ! is_single() ) return; - + global $product; - + $parameters = array(); // Add single quotes to allow jQuery to be substituted into _trackEvent parameters $parameters['category'] = "'" . __( 'Products', 'woocommerce' ) . "'"; $parameters['action'] = "'" . __( 'Add to Cart', 'woocommerce' ) . "'"; $parameters['label'] = "'#" . esc_js( $product->id ) . "'"; - + $this->event_tracking_code( $parameters, '.single_add_to_cart_button' ); } - + /** * Google Analytics event tracking for loop add to cart * **/ function loop_add_to_cart() { - + if ( $this->disable_tracking( $this->ga_event_tracking_enabled ) ) return; - + $parameters = array(); // Add single quotes to allow jQuery to be substituted into _trackEvent parameters $parameters['category'] = "'" . __( 'Products', 'woocommerce' ) . "'"; $parameters['action'] = "'" . __( 'Add to Cart', 'woocommerce' ) . "'"; $parameters['label'] = "'#' + $(this).attr('data-product_id')"; // Product ID - + $this->event_tracking_code( $parameters, '.add_to_cart_button' ); } - + /** * Google Analytics event tracking for loop add to cart - * + * * @param array $parameters - associative array of _trackEvent parameters * @param string $selector - jQuery selector for binding click event **/ private function event_tracking_code( $parameters, $selector ) { global $woocommerce; - + $parameters = apply_filters( 'woocommerce_ga_event_tracking_parameters', $parameters ); - + $woocommerce->add_inline_js(" $('" . $selector . "').click(function() { " . sprintf( "_gaq.push(['_trackEvent', %s, %s, %s]);", $parameters['category'], $parameters['action'], $parameters['label'] ) . " }); "); } - + private function disable_tracking( $type ) { - + if( is_admin() || current_user_can( 'manage_options' ) || ( ! $this->ga_id ) || 'no' == $type ) return true; - + } - + } /** diff --git a/readme.txt b/readme.txt index a3f88384dd6..8526008fd0c 100644 --- a/readme.txt +++ b/readme.txt @@ -160,7 +160,8 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc * Tweak - Order page styling * Fix - has_file() handling for variations * Fix - Hide if cart is empty option -* FIx - Hide individual variations from frontend +* Fix - Hide individual variations from frontend +* Fix - Google Analytics ecommerce tracking = 1.6.2 - 09/08/2012 = * Feature - Added google analytics event tracking for add to cart buttons (thanks to Max Rice)