Merge branch 'release/1.9.9.7.3'

inboundnow · Apr 3, 2019 · 9f8d079 · 9f8d079
2 parents bbe3259 + 0a0e669
commit 9f8d079
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 33 deletions.
diff --git a/core/cta/classes/class.cta.variations.php b/core/cta/classes/class.cta.variations.php
@@ -611,13 +611,11 @@ public static function set_impression_count( $cta_id, $vid, $count) {
 		*/
 		public static function get_conversions( $cta_id, $vid ) {
 
-			/* get clicks */
-			$clicks = self::get_clicks( $cta_id, $vid);
-
-			/* get form submissions */
-			$submissions = self::get_form_submissions( $cta_id, $vid );
+			$conversions = get_post_meta( $cta_id ,'wp-cta-ab-variation-conversions-'.$vid, true);
 
-			$conversions = $clicks + $submissions;
+			if (!is_numeric($conversions)) {
+				$conversions = 0;
+			}
 
 			return $conversions;
 		}

diff --git a/core/cta/classes/class.post-type.wp-call-to-action.php b/core/cta/classes/class.post-type.wp-call-to-action.php
@@ -194,44 +194,27 @@ public static function prepare_column_data( $column, $post_id ) {
 				self::show_stats_data();
 			} elseif ("cta_impressions" == $column) {
 				if (class_exists('Inbound_Analytics')) {
-					self::$cta_impressions = Inbound_Events::get_page_views_count_by('cta_id' , array('cta_id'=> $post_id) );
 					?>
 					<a href='<?php echo admin_url('index.php?action=inbound_generate_report&obj_key=cta_id&cta_id='.$post_id.'&class=Inbound_Impressions_Report&range=1000&tb_hide_nav=true&TB_iframe=true&width=900&height=600'); ?>' class='thickbox inbound-thickbox'>
-						<?php echo self::$cta_impressions; ?>
+						<?php echo self::show_aggregated_stats("cta_impressions"); ?>
 					</a>
 					<?php
 				} else {
 					echo self::show_aggregated_stats("cta_impressions");
 				}
 			} elseif ("cta_actions" == $column) {
 				if (class_exists('Inbound_Analytics')) {
-					self::$cta_conversions = Inbound_Events::get_cta_conversions('cta_id' , array('cta_id'=> $post_id) );
 					?>
 					<a href='<?php echo admin_url('index.php?action=inbound_generate_report&obj_key=cta_id&cta_id='.$post_id.'&class=Inbound_Events_Report&range=1000&exclude_events=inbound_list_add,inbound_list_remove,inbound_content_click&tb_hide_nav=true&TB_iframe=true&width=900&height=600'); ?>' class='thickbox inbound-thickbox'>
-						<?php echo count(self::$cta_conversions); ?>
+						<?php echo self::show_aggregated_stats("cta_actions");; ?>
 					</a>
 					<?php
 				} else {
 					echo self::show_aggregated_stats("cta_actions");
 				}
 
 			} elseif ("cta_cr" == $column) {
-				if (class_exists('Inbound_Analytics')) {
-					if (self::$cta_impressions != 0) {
-						self::$cta_conversion_rate = count(self::$cta_conversions) / self::$cta_impressions;
-					} else {
-						self::$cta_conversion_rate = 0;
-					}
-					self::$cta_conversion_rate = round(self::$cta_conversion_rate,2) * 100;
-					?>
-					<a href='<?php echo admin_url('index.php?action=inbound_generate_report&cta_id='.$post_id.'&class=Inbound_Events_Report&range=1000&tb_hide_nav=true&TB_iframe=true&width=900&height=600'); ?>' class='thickbox inbound-thickbox'>
-						<?php echo self::$cta_conversion_rate.'%' ?>
-					</a>
-					<?php
-				} else {
-					echo self::show_aggregated_stats("cta_cr") . "%";
-				}
-
+				echo self::show_aggregated_stats("cta_cr") . "%";
 			} elseif ("template" == $column) {
 				$template_used = get_post_meta($post->ID, 'wp-cta-selected-template', true);
 				echo $template_used;
@@ -335,10 +318,12 @@ public static function show_stats_data() {
 				foreach ($variations as $vid => $variation)
 				{
 					$letter = $CTA_Variations->vid_to_letter( $post->ID, $vid ); /* convert to letter */
+
 					$vid_impressions = get_post_meta($post->ID,'wp-cta-ab-variation-impressions-'.$vid, true); /* get impressions */
 					$vid_conversions = get_post_meta($post->ID,'wp-cta-ab-variation-conversions-'.$vid, true);
 					$vid_conversions = ($vid_conversions) ? $vid_conversions : 0;
 
+
 					$v_status = get_post_meta($post->ID,'cta_ab_variation_status_'.$vid, true); /* Current status */
 
 					if ($i === 0) { $v_status = $first_status; } /* get status of first */
@@ -349,10 +334,6 @@ public static function show_stats_data() {
 
 					if ($i === 0) { $each_notes = $first_notes; } /* Get first notes */
 
-					$impressions += get_post_meta($post->ID,'wp-cta-ab-variation-impressions-'.$vid, true);
-
-					$conversions += $vid_conversions;
-
 					if ($vid_impressions != 0) {
 						$conversion_rate = $vid_conversions / $vid_impressions;
 					} else {

diff --git a/core/shared/classes/class.events.php b/core/shared/classes/class.events.php
@@ -836,6 +836,10 @@ public static function get_page_views_count_by( $nature = 'lead_id' ,  $params )
                 break;
         }
 
+        if (isset($params['variation_id']) ) {
+            $query .= ' AND variation_id = "'.$params['variation_id'].'" ';
+        }
+
 
         $query .=' AND `page_id` != "0" ';
 
@@ -1160,7 +1164,7 @@ public static function get_events( $params ){
             $query .= ' AND list_id = "'.$params['list_id'].'" ';
         }
 
-        if (isset($params['variation_id']) && $params['variation_id'] ) {
+        if (isset($params['variation_id']) ) {
             $query .= ' AND variation_id = "'.$params['variation_id'].'" ';
         }
 

diff --git a/inbound-pro.php b/inbound-pro.php
@@ -4,7 +4,7 @@
 Plugin URI: http://www.inboundnow.com/
 Description: Professional Inbound Marketing Suite for WordPress
 Author: InboundWP LLC
-Version: 1.9.9.7.2
+Version: 1.9.9.7.3
 Author URI: http://www.inboundnow.com/
 Text Domain: inbound-pro
 */
@@ -95,7 +95,7 @@ public function __construct() {
 		*/
 		private static function define_constants() {
 
-			define('INBOUND_PRO_CURRENT_VERSION', '1.9.9.7.2' );
+			define('INBOUND_PRO_CURRENT_VERSION', '1.9.9.7.3' );
 			define('INBOUND_PRO_STABLE_VERSION', '1.9.9.7.1' );
 			define('INBOUND_PRO_TRANSLATIONS_VERSION', '1.30.22' );
 			define('INBOUND_PRO_URLPATH', plugin_dir_url( __FILE__ ));