Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Update Jetpack WooCommerce Analytics module integration to check for changed template names #11707

Merged
merged 2 commits into from
Nov 9, 2023
Merged

Update Jetpack WooCommerce Analytics module integration to check for changed template names #11707

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88f044b
Update check for different template names
opr Nov 9, 2023
5f6eea9
Return early if content retrieval fails
opr Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/Domain/Services/JetpackWooCommerceAnalytics.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,16 +249,16 @@ public function get_cart_checkout_info() {
$checkout_template = null;
$cart_template_id = null;
$checkout_template_id = null;
$templates = $this->block_templates_controller->get_block_templates( array( 'cart', 'checkout' ) );
$templates = $this->block_templates_controller->get_block_templates( array( 'cart', 'checkout', 'page-checkout', 'page-cart' ) );
$guest_checkout = ucfirst( get_option( 'woocommerce_enable_guest_checkout', 'No' ) );
$create_account = ucfirst( get_option( 'woocommerce_enable_signup_and_login_from_checkout', 'No' ) );

foreach ( $templates as $template ) {
if ( 'cart' === $template->slug ) {
if ( 'cart' === $template->slug || 'page-cart' === $template->slug ) {
$cart_template_id = ( $template->id );
continue;
}
if ( 'checkout' === $template->slug ) {
if ( 'checkout' === $template->slug || 'page-checkout' === $template->slug ) {
$checkout_template_id = ( $template->id );
}
}
Expand All @@ -274,6 +274,16 @@ public function get_cart_checkout_info() {
$checkout_template = get_block_template( $checkout_template_id );
}

// Something failed with the template retrieval, return early with 0 values rather than let a warning appear.
if ( ! $cart_template || ! $checkout_template ) {
return array(
'cart_page_contains_cart_block' => 0,
'cart_page_contains_cart_shortcode' => 0,
'checkout_page_contains_checkout_block' => 0,
'checkout_page_contains_checkout_shortcode' => 0,
);
}

// Update the info transient with data we got from the templates, if the site isn't using WC Blocks we
// won't be doing this so no concern about overwriting.
// Sites that load this code will be loading it on a page using the relevant block, but we still need to check
Expand Down
Loading