From 5a4e588d6dfc30d4388df65dc43380476b057db5 Mon Sep 17 00:00:00 2001
From: Rua Haszard <rua.haszard@automattic.com>
Date: Thu, 26 Mar 2020 11:34:37 +1300
Subject: [PATCH 1/4] add woo analytics event props for block/shortcode use in
 cart/checkout

---
 .../wp-woocommerce-analytics-universal.php    | 75 ++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php b/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php
index c01f634b5c399..4937a1351adca 100644
--- a/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php
+++ b/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php
@@ -82,12 +82,14 @@ public function enqueue_tracking_script() {
 	 * @return array Array of standard event props.
 	 */
 	public function get_common_properties() {
-		return array(
+		$site_info          = array(
 			'blog_id'     => Jetpack::get_option( 'id' ),
 			'ui'          => $this->get_user_id(),
 			'url'         => home_url(),
 			'woo_version' => WC()->version,
 		);
+		$cart_checkout_info = self::get_cart_checkout_info();
+		return array_merge( $site_info, $cart_checkout_info );
 	}
 
 	/**
@@ -416,4 +418,75 @@ public function get_product_categories_concatenated( $product ) {
 		return $line;
 	}
 
+	/**
+	 * Search a specific post for text content.
+	 *
+	 * Note: similar code is in a WooCommerce core PR:
+	 * https://github.com/woocommerce/woocommerce/pull/25932
+	 *
+	 * @param integer $post_id The id of the post to search.
+	 * @param string  $text    The text to search for.
+	 * @return string 'Yes' if post contains $text (otherwise 'No').
+	 */
+	public static function post_contains_text( $post_id, $text ) {
+		global $wpdb;
+
+			// Search for the text anywhere in the post.
+		$wildcarded = "%{$text}%";
+
+		$result = $wpdb->get_var(
+			$wpdb->prepare(
+				"
+				SELECT COUNT( * ) FROM {$wpdb->prefix}posts
+				WHERE ID=%d
+				AND {$wpdb->prefix}posts.post_content LIKE %s
+				",
+				array( $post_id, $wildcarded )
+			)
+		);
+
+		return ( '0' !== $result ) ? 'Yes' : 'No';
+	}
+
+	/**
+	 * Get info about the cart & checkout pages, in particular
+	 * whether the store is using shortcodes or Gutenberg blocks.
+	 * This info is cached in a transient.
+	 *
+	 * Note: similar code is in a WooCommerce core PR:
+	 * https://github.com/woocommerce/woocommerce/pull/25932
+	 *
+	 * @return array
+	 */
+	public static function get_cart_checkout_info() {
+		$info = get_transient( 'jetpack-woocommerce-analytics-cart-checkout-info-cache' );
+
+		if ( false === $info ) {
+			$cart_page_id     = wc_get_page_id( 'cart' );
+			$checkout_page_id = wc_get_page_id( 'checkout' );
+
+			$info = array(
+				'cart_page_contains_cart_block'         => self::post_contains_text(
+					$cart_page_id,
+					'<!-- wp:woocommerce/cart'
+				),
+				'cart_page_contains_cart_shortcode'     => self::post_contains_text(
+					$cart_page_id,
+					'[woocommerce_cart]'
+				),
+				'checkout_page_contains_checkout_block' => self::post_contains_text(
+					$checkout_page_id,
+					'<!-- wp:woocommerce/checkout'
+				),
+				'checkout_page_contains_checkout_shortcode' => self::post_contains_text(
+					$checkout_page_id,
+					'[woocommerce_checkout]'
+				),
+			);
+
+			set_transient( 'jetpack-woocommerce-analytics-cart-checkout-info-cache', $info, DAY_IN_SECONDS );
+		}
+
+		return $info;
+	}
 }

From dfd767e1c7a12c00849e10a7a1ccf196d378dae6 Mon Sep 17 00:00:00 2001
From: Rua Haszard <rua.haszard@automattic.com>
Date: Thu, 26 Mar 2020 13:02:52 +1300
Subject: [PATCH 2/4] use int (0/1) value for cart/checkout tracks props: -
 consistent with other boolean tracks event props

---
 .../classes/wp-woocommerce-analytics-universal.php            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php b/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php
index 4937a1351adca..24789e5e246ae 100644
--- a/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php
+++ b/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php
@@ -426,7 +426,7 @@ public function get_product_categories_concatenated( $product ) {
 	 *
 	 * @param integer $post_id The id of the post to search.
 	 * @param string  $text    The text to search for.
-	 * @return string 'Yes' if post contains $text (otherwise 'No').
+	 * @return integer 1 if post contains $text (otherwise 0).
 	 */
 	public static function post_contains_text( $post_id, $text ) {
 		global $wpdb;
@@ -445,7 +445,7 @@ public static function post_contains_text( $post_id, $text ) {
 			)
 		);
 
-		return ( '0' !== $result ) ? 'Yes' : 'No';
+		return ( '0' !== $result ) ? 1 : 0;
 	}
 
 	/**

From 7a6b95bff0fcf9bc7cb50fc4f700a781b98a7189 Mon Sep 17 00:00:00 2001
From: Rua Haszard <rua.haszard@automattic.com>
Date: Fri, 27 Mar 2020 11:03:17 +1300
Subject: [PATCH 3/4] feedback fixes: whitespace, use underscore for transient
 name

---
 .../classes/wp-woocommerce-analytics-universal.php            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php b/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php
index 24789e5e246ae..5d7ec10117093 100644
--- a/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php
+++ b/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php
@@ -431,7 +431,7 @@ public function get_product_categories_concatenated( $product ) {
 	public static function post_contains_text( $post_id, $text ) {
 		global $wpdb;
 
-			// Search for the text anywhere in the post.
+		// Search for the text anywhere in the post.
 		$wildcarded = "%{$text}%";
 
 		$result = $wpdb->get_var(
@@ -459,7 +459,7 @@ public static function post_contains_text( $post_id, $text ) {
 	 * @return array
 	 */
 	public static function get_cart_checkout_info() {
-		$info = get_transient( 'jetpack-woocommerce-analytics-cart-checkout-info-cache' );
+		$info = get_transient( 'jetpack_woocommerce_analytics_cart_checkout_info_cache' );
 
 		if ( false === $info ) {
 			$cart_page_id     = wc_get_page_id( 'cart' );

From 6bfc81731d879bf60f94b4b90dfb931844a6fd9c Mon Sep 17 00:00:00 2001
From: Rua Haszard <rua.haszard@automattic.com>
Date: Sat, 28 Mar 2020 08:53:08 +1300
Subject: [PATCH 4/4] update transient name in both places (!)

---
 .../classes/wp-woocommerce-analytics-universal.php           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php b/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php
index 5d7ec10117093..609b30d99fbc8 100644
--- a/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php
+++ b/modules/woocommerce-analytics/classes/wp-woocommerce-analytics-universal.php
@@ -459,8 +459,9 @@ public static function post_contains_text( $post_id, $text ) {
 	 * @return array
 	 */
 	public static function get_cart_checkout_info() {
-		$info = get_transient( 'jetpack_woocommerce_analytics_cart_checkout_info_cache' );
+		$transient_name = 'jetpack_woocommerce_analytics_cart_checkout_info_cache';
 
+		$info = get_transient( $transient_name );
 		if ( false === $info ) {
 			$cart_page_id     = wc_get_page_id( 'cart' );
 			$checkout_page_id = wc_get_page_id( 'checkout' );
@@ -484,7 +485,7 @@ public static function get_cart_checkout_info() {
 				),
 			);
 
-			set_transient( 'jetpack-woocommerce-analytics-cart-checkout-info-cache', $info, DAY_IN_SECONDS );
+			set_transient( $transient_name, $info, DAY_IN_SECONDS );
 		}
 
 		return $info;