@automattic/newspack-blocks 4.12.3 → 4.13.0

package/includes/class-modal-checkout.php

@@ -7,7 +7,7 @@
 
 namespace Newspack_Blocks;
 
-use Newspack_Blocks\Tracking\Data_Events;
+use Newspack_Blocks\Modal_Checkout\Checkout_Data;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -710,8 +710,6 @@ final class Modal_Checkout {
 									$variation_name = wc_get_formatted_variation( $variation, true );
 									$price          = $variation->get_price();
 									$price_html     = $variation->get_price_html();
-									$frequency      = '';
-									$product_type = Data_Events::get_product_type( $product_id );
 
 									// Use suggested price if NYP is active and set for variation.
 									if ( \Newspack_Blocks::can_use_name_your_price() && \WC_Name_Your_Price_Helpers::is_nyp( $variation_id ) ) {
@@ -722,29 +720,6 @@ final class Modal_Checkout {
 										}
 									}
 
-									if ( class_exists( '\WC_Subscriptions_Product' ) && \WC_Subscriptions_Product::is_subscription( $variation ) ) {
-										$frequency = \WC_Subscriptions_Product::get_period( $variation );
-									}
-
-									$name = sprintf(
-										/* translators: 1: variable product name, 2: product variation name */
-										__( '%1$s - %2$s', 'newspack-blocks' ),
-										$product_name,
-										$variation_name
-									);
-									$product_price_summary = self::get_summary_card_price_string( $name, $price, $frequency );
-									$product_data          = [
-										'amount'       => $price,
-										'action_type'  => 'checkout_button',
-										'currency'     => function_exists( 'get_woocommerce_currency' ) ? \get_woocommerce_currency() : 'USD',
-										'product_price_summary' => $product_price_summary,
-										'product_id'   => (string) $product_id,
-										'product_type' => $product_type,
-										'recurrence'   => ! empty( $frequency ) ? $frequency : 'once',
-										'referrer'     => substr( \get_permalink(), strlen( home_url() ) ), // TODO: Is this OK?
-										'variation_id' => (string) $variation_id,
-									];
-
 									// Replace nyp price html for variations.
 									if ( class_exists( '\WC_Name_Your_Price_Helpers' ) && \WC_Name_Your_Price_Helpers::is_nyp( $variation->get_id() ) ) {
 										$price_html = str_replace( ':', '', $price_html );
@@ -757,7 +732,7 @@ final class Modal_Checkout {
 											<span class="price"><?php echo $price_html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></span>
 										</div>
 										<div class="variation"><?php echo esc_html( $variation_name ); ?></div>
-										<form data-product="<?php echo esc_attr( wp_json_encode( $product_data ) ); ?>">
+										<form data-checkout="<?php echo esc_attr( wp_json_encode( Checkout_Data::get_checkout_data( $variation ) ) ); ?>">
 											<input type="hidden" name="newspack_checkout" value="1" />
 											<button type="submit" class="<?php echo esc_attr( "{$class_prefix}__button {$class_prefix}__button--primary" ); ?> newspack-modal-checkout-variation-selection"><?php echo esc_html( self::get_modal_checkout_labels( 'checkout_confirm_variation' ) ); ?></button>
 										</form>
@@ -1025,6 +1000,7 @@ final class Modal_Checkout {
 				'newspack_class_prefix'           => self::get_class_prefix(),
 				'is_registration_required'        => self::is_registration_required(),
 				'has_unsupported_payment_gateway' => self::has_unsupported_payment_gateway(),
+				'checkout_url'                    => remove_query_arg( 'my_account_checkout', add_query_arg( 'modal_checkout', '1', wc_get_checkout_url() ) ),
 				'labels'                          => [
 					'auth_modal_title'     => self::get_modal_checkout_labels( 'auth_modal_title' ),
 					'checkout_modal_title' => self::get_modal_checkout_labels( 'checkout_modal_title' ),
@@ -1111,29 +1087,23 @@ final class Modal_Checkout {
 	 * Get after success button params.
 	 */
 	private static function get_after_success_params() {
-		// Express checkout payment requests are separate requests, so they won't have the after_success attributes. We'll have to check the HTTP_REFERER instead.
+		$request_params = $_REQUEST; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		if ( self::is_express_checkout() ) {
+			$request_params = [];
 			$referrer = isset( $_SERVER['HTTP_REFERER'] ) ? \esc_url_raw( \wp_unslash( $_SERVER['HTTP_REFERER'] ) ) : false; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
 			if ( $referrer ) {
 				$referrer_query = \wp_parse_url( $referrer, PHP_URL_QUERY );
-				\wp_parse_str( $referrer_query, $referrer_query_params );
-				return array_filter(
-					[
-						'after_success_behavior'     => isset( $referrer_query_params['after_success_behavior'] ) ? sanitize_text_field( wp_unslash( $referrer_query_params['after_success_behavior'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-						'after_success_url'          => isset( $referrer_query_params['after_success_url'] ) ? sanitize_url( wp_unslash( $referrer_query_params['after_success_url'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-						'after_success_button_label' => isset( $referrer_query_params['after_success_button_label'] ) ? sanitize_text_field( wp_unslash( $referrer_query_params['after_success_button_label'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					]
-				);
+				\wp_parse_str( $referrer_query, $request_params );
 			}
-		} else {
-			return array_filter(
-				[
-					'after_success_behavior'     => isset( $_REQUEST['after_success_behavior'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['after_success_behavior'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					'after_success_url'          => isset( $_REQUEST['after_success_url'] ) ? sanitize_url( wp_unslash( $_REQUEST['after_success_url'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					'after_success_button_label' => isset( $_REQUEST['after_success_button_label'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['after_success_button_label'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				]
-			);
 		}
+		return array_filter(
+			[
+				'after_success_behavior'     => isset( $request_params['after_success_behavior'] ) ? sanitize_text_field( wp_unslash( $request_params['after_success_behavior'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				'after_success_url'          => isset( $request_params['after_success_url'] ) ? sanitize_url( wp_unslash( $request_params['after_success_url'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				'after_success_button_label' => isset( $request_params['after_success_button_label'] ) ? sanitize_text_field( wp_unslash( $request_params['after_success_button_label'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				'action_type'                => isset( $request_params['action_type'] ) ? sanitize_text_field( wp_unslash( $request_params['action_type'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			]
+		);
 	}
 
 	/**
@@ -1538,16 +1508,7 @@ final class Modal_Checkout {
 	 */
 	public static function pass_url_param_on_redirect( $location ) {
 		if ( self::is_modal_checkout() ) {
-			$params = [ 'modal_checkout' => 1 ];
-			$newspack_popup_id = filter_input( INPUT_GET, 'newspack_popup_id', FILTER_SANITIZE_NUMBER_INT );
-			$gate_post_id = filter_input( INPUT_GET, 'memberships_content_gate', FILTER_SANITIZE_NUMBER_INT );
-			if ( $newspack_popup_id ) {
-				$params['newspack_popup_id'] = $newspack_popup_id;
-			}
-			if ( $gate_post_id ) {
-				$params['memberships_content_gate'] = $gate_post_id;
-			}
-			$location = \add_query_arg( $params, $location );
+			$location = \add_query_arg( [ 'modal_checkout' => 1 ], $location );
 		}
 		return $location;
 	}
@@ -1707,29 +1668,28 @@ final class Modal_Checkout {
 		if ( 1 !== $cart->get_cart_contents_count() ) {
 			return;
 		}
+		$cart_item_key = array_key_first( $cart->get_cart() );
+		$cart_item = $cart->get_cart_item( $cart_item_key );
+		$product_id = $cart_item['variation_id'] ? $cart_item['variation_id'] : $cart_item['product_id'];
 		$class_prefix = self::get_class_prefix();
 		?>
 			<div class="<?php echo esc_attr( "order-details-summary {$class_prefix}__box {$class_prefix}__box--text-center" ); ?>">
 			<?php
 			// phpcs:disable WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- WooCommerce hooks.
-			foreach ( $cart->get_cart() as $cart_item_key => $cart_item ) :
-				$_product = apply_filters( 'woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key );
-				if ( $_product && $_product->exists() && $cart_item['quantity'] > 0 && apply_filters( 'woocommerce_checkout_cart_item_visible', true, $cart_item, $cart_item_key ) ) :
-					// Create an array of order information to pass to GA4 via JavaScript.
-					$data_order_details = Data_Events::build_js_data_events( $_product->get_id(), $cart_item );
-					?>
-					<p id="modal-checkout-product-details" data-order-details='<?php echo wp_json_encode( $data_order_details ); ?>'>
-						<strong>
-							<?php
-							echo apply_filters( 'woocommerce_cart_item_name', $_product->get_name(), $cart_item, $cart_item_key ) . ': '; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-							echo wc_get_formatted_cart_item_data( $cart_item ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-							?>
-							<?php echo apply_filters( 'woocommerce_cart_item_subtotal', $cart->get_product_subtotal( $_product, $cart_item['quantity'] ), $cart_item, $cart_item_key ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
-						</strong>
-					</p>
-					<?php
-				endif;
-			endforeach;
+			$_product = apply_filters( 'woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key );
+			if ( $_product && $_product->exists() && $cart_item['quantity'] > 0 && apply_filters( 'woocommerce_checkout_cart_item_visible', true, $cart_item, $cart_item_key ) ) :
+				?>
+				<p id="modal-checkout-product-details" data-checkout='<?php echo wp_json_encode( Checkout_Data::get_checkout_data( $cart ) ); ?>'>
+					<strong>
+						<?php
+						echo apply_filters( 'woocommerce_cart_item_name', $_product->get_name(), $cart_item, $cart_item_key ) . ': '; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+						echo wc_get_formatted_cart_item_data( $cart_item ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+						?>
+						<?php echo apply_filters( 'woocommerce_cart_item_subtotal', $cart->get_product_subtotal( $_product, $cart_item['quantity'] ), $cart_item, $cart_item_key ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+					</strong>
+				</p>
+				<?php
+			endif;
 			// phpcs:enable
 			?>
 			</div>
@@ -2080,40 +2040,6 @@ final class Modal_Checkout {
 		return self::$modal_checkout_labels[ $key ] ?? '';
 	}
 
-	/**
-	 * Get price string for the price summary card to render in auth flow.
-	 *
-	 * @param string $name      The name.
-	 * @param string $price     The price. Optional. If not provided, the price string will contain 0.
-	 * @param string $frequency The frequency. Optional. If not provided, the price will be treated as a one-time payment.
-	 *
-	 * @return string The price string.
-	 */
-	public static function get_summary_card_price_string( $name, $price = '', $frequency = '' ) {
-		if ( ! $price ) {
-			$price = '0';
-		}
-
-		if ( function_exists( 'wcs_price_string' ) && function_exists( 'wc_price' ) ) {
-			if ( $frequency && $frequency !== 'once' ) {
-				$price = wp_strip_all_tags(
-					wcs_price_string(
-						[
-							'recurring_amount'    => $price,
-							'subscription_period' => $frequency,
-							'use_per_slash'       => true,
-						]
-					)
-				);
-			} else {
-				$price = wp_strip_all_tags( wc_price( $price ) );
-			}
-		}
-
-		// translators: 1 is the name of the item. 2 is the price of the item.
-		return sprintf( __( '%1$s: %2$s', 'newspack-blocks' ), $name, $price );
-	}
-
 	/**
 	 * Set the checkout registration flag to WC session.
 	 */

package/includes/class-newspack-blocks.php

@@ -1504,6 +1504,10 @@ class Newspack_Blocks {
 			$currency_symbol     = function_exists( 'get_woocommerce_currency_symbol' ) ? \get_woocommerce_currency_symbol() : '$';
 			$wc_formatted_amount = '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">' . $currency_symbol . '</span>AMOUNT_PLACEHOLDER</bdi></span> FREQUENCY_PLACEHOLDER';
 		} else {
+			// If it's a float but with no decimal value, treat it as an int.
+			if ( is_float( $amount ) && floor( $amount ) == $amount ) {
+				$amount = (int) $amount;
+			}
 			// Format the amount with currency symbol and separators.
 			$amount_string = \wc_price(
 				$amount,

package/includes/modal-checkout/class-checkout-data.php

@@ -0,0 +1,287 @@
+<?php
+/**
+ * Newspack Blocks Modal Checkout Data.
+ *
+ * @package Newspack
+ */
+
+namespace Newspack_Blocks\Modal_Checkout;
+
+/**
+ * Checkout Data Class.
+ */
+final class Checkout_Data {
+	/**
+	 * Get price string for the price summary card to render in auth flow.
+	 *
+	 * @param string $name      The name.
+	 * @param string $price     The price. Optional. If not provided, the price string will contain 0.
+	 * @param string $frequency The frequency. Optional. If not provided, the price will be treated as a one-time payment.
+	 *
+	 * @return string The price string.
+	 */
+	public static function get_price_summary( $name, $price = '', $frequency = '' ) {
+		if ( ! $price ) {
+			$price = '0';
+		}
+
+		if ( function_exists( 'wcs_price_string' ) && function_exists( 'wc_price' ) ) {
+			if ( $frequency && $frequency !== 'once' ) {
+				$price = wp_strip_all_tags(
+					wcs_price_string(
+						[
+							'recurring_amount'    => $price,
+							'subscription_period' => $frequency,
+							'use_per_slash'       => true,
+						]
+					)
+				);
+			} else {
+				$price = wp_strip_all_tags( wc_price( $price ) );
+			}
+		}
+
+		// translators: 1 is the name of the item. 2 is the price of the item.
+		return sprintf( __( '%1$s: %2$s', 'newspack-blocks' ), $name, $price );
+	}
+
+	/**
+	 * Returns whether a product is a one time purchase, or recurring and when.
+	 *
+	 * @param string $product_id Product's ID.
+	 */
+	public static function get_purchase_recurrence( $product_id ) {
+		$recurrence = get_post_meta( $product_id, '_subscription_period', true );
+		if ( empty( $recurrence ) ) {
+			$recurrence = 'once';
+		}
+		return $recurrence;
+	}
+
+	/**
+	 * Returns whether a product ID is associated with a membership.
+	 *
+	 * @param string $product_id Product's ID.
+	 */
+	public static function is_membership_product( $product_id ) {
+		if ( ! function_exists( 'wc_memberships_get_membership_plans' ) ) {
+			return false;
+		}
+		$membership_plans = wc_memberships_get_membership_plans();
+		$plans            = [];
+
+		foreach ( $membership_plans as $plan ) {
+			$subscription_plan  = new \WC_Memberships_Integration_Subscriptions_Membership_Plan( $plan->get_id() );
+			$required_products = $subscription_plan->get_subscription_product_ids();
+			if ( in_array( $product_id, $required_products ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * Returns the product type: product, subscription, donation, or membership.
+	 *
+	 * @param string $product_id Product's ID.
+	 */
+	public static function get_product_type( $product_id ) {
+		$product_type = 'product';
+		$recurrence   = self::get_purchase_recurrence( $product_id );
+
+		// Check if it's a subscription product.
+		if ( 'once' !== $recurrence ) {
+			$product_type = 'subscription';
+		}
+
+		// Check if it's a membership product.
+		if ( self::is_membership_product( $product_id ) ) {
+			$product_type = 'membership';
+		}
+
+		// Check if it's a donation product.
+		if ( method_exists( 'Newspack\Donations', 'is_donation_product' ) ) {
+			if ( \Newspack\Donations::is_donation_product( $product_id ) ) {
+				$product_type = 'donation';
+			}
+		}
+
+		return $product_type;
+	}
+
+	/**
+	 * Returns the action type: checkout_button or donation.
+	 *
+	 * @param string $product_id Product's ID.
+	 */
+	public static function get_action_type( $product_id ) {
+		$action_type = 'checkout_button';
+		// Check if it's a donation product, and update action_type, product_type.
+		if ( method_exists( 'Newspack\Donations', 'is_donation_product' ) ) {
+			if ( \Newspack\Donations::is_donation_product( $product_id ) ) {
+				$action_type = 'donation';
+			}
+		}
+		return $action_type;
+	}
+
+	/**
+	 * Get donate product checkout data.
+	 *
+	 * @param string $frequency The frequency.
+	 * @param int    $amount    The amount.
+	 *
+	 * @return array
+	 */
+	public static function get_donation_checkout_data( $frequency, $amount = null ) {
+		if ( ! method_exists( 'Newspack\Donations', 'get_donation_product' ) ) {
+			return [];
+		}
+		$product_id = \Newspack\Donations::get_donation_product( $frequency );
+		if ( ! $product_id ) {
+			return [];
+		}
+		$product = wc_get_product( $product_id );
+		if ( ! $product ) {
+			return [];
+		}
+		$data = self::get_checkout_data( $product );
+		if ( $amount ) {
+			$data['amount'] = $amount;
+		}
+		return $data;
+	}
+
+	/**
+	 * Returns checkout data given a product, product variation, cart or order object.
+	 *
+	 * @param \WC_Product|\WC_Product_Variation|\WC_Cart|\WC_Order $source Product, product variation, cart or order object.
+	 *
+	 * @return array
+	 */
+	public static function get_checkout_data( $source ) {
+		$data = [];
+		if ( empty( $source ) ) {
+			return $data;
+		}
+
+		$cart_item    = null;
+		$order        = null;
+		$referrer     = '';
+		$variation_id = null;
+
+		if ( $source instanceof \WC_Product_Variation ) {
+			$product_id = $source->get_parent_id();
+			$variation_id = $source->get_id();
+			$amount = $source->get_price();
+		} elseif ( $source instanceof \WC_Product ) {
+			$product_id = $source->get_id();
+			if ( $source->get_parent_id() ) {
+				$product_id   = $source->get_parent_id();
+				$variation_id = $source->get_id();
+			}
+			$amount = $source->get_price();
+		} elseif ( $source instanceof \WC_Cart ) {
+			$cart_items   = $source->get_cart();
+			$cart_item    = reset( $cart_items ); // Use only the first item in the cart.
+			$product_id   = $cart_item['product_id'];
+			$variation_id = $cart_item['variation_id'];
+			$amount       = $cart_item['data']->get_price();
+			$referrer     = $cart_item['referer'] ?? '';
+		} elseif ( $source instanceof \WC_Order ) {
+			$order        = $source;
+			$order_items  = $order->get_items();
+			$order_item   = reset( $order_items ); // Use only the first item in the order.
+			$product_id   = $order_item->get_product_id();
+			$variation_id = $order_item->get_variation_id();
+			$amount       = $order_item->get_subtotal();
+			$referrer     = $order->get_meta( '_newspack_referer' );
+		}
+
+		// If we have no referrer, set it to the current path.
+		if ( ! $referrer ) {
+			global $wp;
+			$referrer = $wp->request;
+		}
+
+		$product_type = self::get_product_type( $product_id );
+		$recurrence   = self::get_purchase_recurrence( $product_id );
+
+		/**
+		 * Price summary name.
+		 */
+		if ( 'donation' === $product_type ) {
+			$name = __( 'Donate', 'newspack-blocks' );
+		} elseif ( $variation_id ) {
+			$variation = wc_get_product( $variation_id );
+			$name = $variation->get_name();
+		} else {
+			$product = wc_get_product( $product_id );
+			$name = $product->get_name();
+		}
+
+		$data = [
+			'amount'           => $amount,
+			'action_type'      => self::get_action_type( $product_id ),
+			'currency'         => function_exists( 'get_woocommerce_currency' ) ? \get_woocommerce_currency() : 'USD',
+			'product_id'       => strval( $product_id ? $product_id : '' ),
+			'product_type'     => $product_type,
+			'price_summary'    => self::get_price_summary( $name, $amount, $recurrence ),
+			'summary_template' => self::get_price_summary( $name, '{{PRICE}}', $recurrence ),
+			'referrer'         => $referrer ? str_replace( home_url(), '', $referrer ) : '', // Keeps format consistent for Homepage with Donate and Checkout Button blocks.
+			'recurrence'       => $recurrence,
+			'variation_id'     => strval( $variation_id ? $variation_id : '' ),
+		];
+
+		/**
+		 * Order specific data.
+		 */
+		if ( $order ) {
+			$data['order_id'] = $order->get_id();
+			if ( in_array( $product_type, [ 'subscription', 'membership' ], true ) ) {
+				$subscription_renewal = $order->get_meta( '_subscription_renewal' );
+				if ( $subscription_renewal ) {
+					$data['subscription_renewal'] = $subscription_renewal;
+				}
+				if ( function_exists( 'wcs_get_subscriptions_for_order' ) ) {
+					$subscriptions = wcs_get_subscriptions_for_order( $order );
+					if ( ! empty( $subscriptions ) ) {
+						$data['subscription_ids'] = array_values(
+							array_map(
+								function( $subscription ) {
+									return $subscription->get_id();
+								},
+								$subscriptions
+							)
+						);
+					}
+				}
+			}
+		}
+
+		/**
+		 * Gate and popup data.
+		 */
+		$gate_post_id = null;
+		$newspack_popup_id = null;
+		if ( $order ) {
+			$gate_post_id = $order->get_meta( '_memberships_content_gate' );
+			$newspack_popup_id = $order->get_meta( '_newspack_popup_id' );
+		} elseif ( $cart_item ) {
+			$gate_post_id = $cart_item['memberships_content_gate'] ?? null;
+			$newspack_popup_id = $cart_item['newspack_popup_id'] ?? null;
+		} else {
+			$gate_post_id = filter_input( INPUT_GET, 'memberships_content_gate', FILTER_SANITIZE_NUMBER_INT );
+			$newspack_popup_id = filter_input( INPUT_GET, 'newspack_popup_id', FILTER_SANITIZE_NUMBER_INT );
+		}
+		if ( $gate_post_id ) {
+			$data['gate_post_id'] = $gate_post_id;
+		}
+		if ( $newspack_popup_id ) {
+			$data['newspack_popup_id'] = $newspack_popup_id;
+		}
+
+		return $data;
+	}
+}

package/includes/tracking/class-data-events.php

@@ -7,6 +7,8 @@
 
 namespace Newspack_Blocks\Tracking;
 
+use Newspack_Blocks\Modal_Checkout\Checkout_Data;
+
 /**
  * Tracking Data Events Class.
  */
@@ -47,143 +49,6 @@ final class Data_Events {
 		);
 	}
 
-	/**
-	 * Returns whether a product is a one time purchase, or recurring and when.
-	 *
-	 * @param string $product_id Product's ID.
-	 */
-	public static function get_purchase_recurrence( $product_id ) {
-		$recurrence = get_post_meta( $product_id, '_subscription_period', true );
-		if ( empty( $recurrence ) ) {
-			$recurrence = 'once';
-		}
-		return $recurrence;
-	}
-
-	/**
-	 * Returns whether a product ID is associated with a membership.
-	 *
-	 * @param string $product_id Product's ID.
-	 */
-	public static function is_membership_product( $product_id ) {
-		if ( ! function_exists( 'wc_memberships_get_membership_plans' ) ) {
-			return false;
-		}
-		$membership_plans = wc_memberships_get_membership_plans();
-		$plans            = [];
-
-		foreach ( $membership_plans as $plan ) {
-			$subscription_plan  = new \WC_Memberships_Integration_Subscriptions_Membership_Plan( $plan->get_id() );
-			$required_products = $subscription_plan->get_subscription_product_ids();
-			if ( in_array( $product_id, $required_products ) ) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-	/**
-	 * Returns the product type: product, subscription, donation, or membership.
-	 * TODOGA4: move this check & related functions into a more central location, and update based on final decision for product types.
-	 *
-	 * @param string $product_id Product's ID.
-	 */
-	public static function get_product_type( $product_id ) {
-		$product_type = 'product';
-		$recurrence   = self::get_purchase_recurrence( $product_id );
-
-		// Check if it's a subscription product.
-		if ( 'once' !== $recurrence ) {
-			$product_type = 'subscription';
-		}
-
-		// Check if it's a membership product.
-		if ( self::is_membership_product( $product_id ) ) {
-			$product_type = 'membership';
-		}
-
-		// Check if it's a donation product.
-		if ( method_exists( 'Newspack\Donations', 'is_donation_product' ) ) {
-			if ( \Newspack\Donations::is_donation_product( $product_id ) ) {
-				$product_type = 'donation';
-			}
-		}
-
-		return $product_type;
-	}
-
-	/**
-	 * Returns the action type: checkout_button or donation.
-	 *
-	 * @param string $product_id Product's ID.
-	 */
-	public static function get_action_type( $product_id ) {
-		$action_type = 'checkout_button';
-		// Check if it's a donation product, and update action_type, product_type.
-		if ( method_exists( 'Newspack\Donations', 'is_donation_product' ) ) {
-			if ( \Newspack\Donations::is_donation_product( $product_id ) ) {
-				$action_type = 'donation';
-			}
-		}
-		return $action_type;
-	}
-
-	/**
-	 * Returns an array of product information.
-	 *
-	 * @param int      $product_id Product's ID.
-	 * @param array    $cart_item Cart item, if during checkout.
-	 * @param WC_Order $order Completed order, if checkout is completed.
-	 *
-	 * @return array
-	 */
-	public static function build_js_data_events( $product_id, $cart_item = null, $order = null ) {
-		$data_order_details = [];
-		if ( empty( $product_id ) || ( empty( $cart_item ) && empty( $order ) ) ) {
-			return $data_order_details;
-		}
-
-		// Reassign the IDs to make sure the product is the product and the variation is the variation.
-		$product           = \wc_get_product( $product_id );
-		$product_parent_id = $product->get_parent_id();
-		$variation_id = '';
-		if ( '' !== $product_parent_id && 0 !== $product_parent_id ) {
-			$variation_id = $product_id;
-			$product_id   = $product_parent_id;
-		}
-
-		$amount   = 0;
-		$referrer = '';
-		if ( ! empty( $order ) ) {
-			$amount = $order->get_total();
-			$referrer = $order->get_meta( '_newspack_referer' );
-		} elseif ( ! empty( $cart_item ) ) {
-			$amount = $cart_item['data']->get_price();
-			$referrer = $cart_item['referer'];
-		}
-
-		$data_order_details = [
-			'amount'       => $amount,
-			'action_type'  => self::get_action_type( $product_id ),
-			'currency'     => function_exists( 'get_woocommerce_currency' ) ? \get_woocommerce_currency() : 'USD',
-			'product_id'   => strval( $product_id ),
-			'product_type' => self::get_product_type( $product_id ),
-			'referrer'     => str_replace( home_url(), '', $referrer ), // Keeps format consistent for Homepage with Donate and Checkout Button blocks.
-			'recurrence'   => self::get_purchase_recurrence( $product_id ),
-			'variation_id' => strval( $variation_id ),
-		];
-		$gate_post_id = ! empty( $order ) ? $order->get_meta( '_memberships_content_gate' ) : filter_input( INPUT_GET, 'memberships_content_gate', FILTER_SANITIZE_NUMBER_INT );
-		if ( $gate_post_id ) {
-			$data_order_details['gate_post_id'] = $gate_post_id;
-		}
-		$newspack_popup_id = ! empty( $order ) ? $order->get_meta( '_newspack_popup_id' ) : filter_input( INPUT_GET, 'newspack_popup_id', FILTER_SANITIZE_NUMBER_INT );
-		if ( $newspack_popup_id ) {
-			$data_order_details['newspack_popup_id'] = $newspack_popup_id;
-		}
-		return $data_order_details;
-	}
-
 	/**
 	 * Send data to GA4.
 	 *
@@ -207,10 +72,10 @@ final class Data_Events {
 		$product_id = is_array( $data['platform_data']['product_id'] ) ? $data['platform_data']['product_id'][0] : $data['platform_data']['product_id'];
 
 		$data['action']       = self::FORM_SUBMISSION_SUCCESS;
-		$data['action_type']  = self::get_action_type( $product_id );
+		$data['action_type']  = Checkout_Data::get_action_type( $product_id );
 		$data['product_id']   = $product_id;
-		$data['product_type'] = self::get_product_type( $product_id );
-		$data['recurrence']   = self::get_purchase_recurrence( $product_id );
+		$data['product_type'] = Checkout_Data::get_product_type( $product_id );
+		$data['recurrence']   = Checkout_Data::get_purchase_recurrence( $product_id );
 
 		return $data;
 	}