In our customer notification emails, only display the subscription that is about to renew or expire, don't show all subscriptions purchased in the parent order. (#722)

* New function subscription_details() to display subscription details, similar to order_details()

* Replace add_sub_info_email() uses with new subscription_detail() function

* Clean up subscription_details()

* Remove unnecessary whitespace

* Fix docblock

* Add changelog entry

Author: Matt Allan

changelog.txt

@@ -1,5 +1,8 @@
 *** WooCommerce Subscriptions Core Changelog ***
 
+= 7.7.1 - 2024-xx-xx =
+* Fix - Only show the individual subscription information in customer notification emails, not all subscriptions purchased in the initial order.
+
 = 7.7.0 - 2024-11-13 =
 * Add - New Customer Notification feature: sends reminder emails for upcoming subscription renewals, trials ending, and subscription expirations.
 * Fix - Prevent adding products to the cart if a subscription renewal is already present.

includes/class-wc-subscriptions-email.php

@@ -294,6 +294,31 @@ public static function order_details( $order, $sent_to_admin = false, $plain_tex
 		);
 	}
 
+	/**
+	 * Show the subscription details table.
+	 *
+	 * @param WC_Subscription[] $subscriptions        List of subscriptions. Also accepts a single subscription.
+	 * @param WC_Order|null     $order                The order related to the subscription - defaults to parent order.
+	 * @param bool              $sent_to_admin        Whether the email is sent to admin - defaults to false.
+	 * @param bool              $plain_text           Whether the email should use plain text templates - defaults to false.
+	 * @param bool              $skip_my_account_link Whether to skip displaying the My Account link - defaults to false.
+	 */
+	public static function subscription_details( $subscriptions, $order = null, $sent_to_admin = false, $plain_text = false, $skip_my_account_link = false ) {
+		$template = ( $plain_text ) ? 'emails/plain/subscription-info.php' : 'emails/subscription-info.php';
+
+		wc_get_template(
+			$template,
+			array(
+				'order'                => ! $order ? $subscription->get_parent() : $order,
+				'subscriptions'        => is_array( $subscriptions ) ? $subscriptions : [ $subscriptions ],
+				'is_admin_email'       => $sent_to_admin,
+				'skip_my_account_link' => $skip_my_account_link,
+			),
+			'',
+			WC_Subscriptions_Core_Plugin::instance()->get_subscriptions_core_directory( 'templates/' )
+		);
+	}
+
 	/**
 	 * Detach WC transactional emails from a specific hook.
 	 *

templates/emails/customer-notification-auto-renewal.php

@@ -56,7 +56,7 @@
 <?php
 
 // Show subscription details.
-\WC_Subscriptions_Order::add_sub_info_email( $order, $sent_to_admin, $plain_text, true );
+\WC_Subscriptions_Email::subscription_details( $subscription, $order, $sent_to_admin, $plain_text, true );
 ?>
 	<p>
 		<small>

templates/emails/customer-notification-auto-trial-ending.php

@@ -69,7 +69,7 @@
 <?php
 
 // Show subscription details.
-\WC_Subscriptions_Order::add_sub_info_email( $order, $sent_to_admin, $plain_text, true );
+\WC_Subscriptions_Email::subscription_details( $subscription, $order, $sent_to_admin, $plain_text, true );
 
 /**
  * Show user-defined additional content - this is set in each email's settings.

templates/emails/customer-notification-expiring-subscription.php

@@ -56,7 +56,7 @@
 <?php
 
 // Show subscription details.
-\WC_Subscriptions_Order::add_sub_info_email( $order, $sent_to_admin, $plain_text, true );
+\WC_Subscriptions_Email::subscription_details( $subscription, $order, $sent_to_admin, $plain_text, true );
 
 /**
  * Show user-defined additional content - this is set in each email's settings.

templates/emails/customer-notification-manual-renewal.php

@@ -97,7 +97,7 @@
 <?php
 
 // Show subscription details.
-\WC_Subscriptions_Order::add_sub_info_email( $order, $sent_to_admin, $plain_text );
+\WC_Subscriptions_Email::subscription_details( $subscription, $order, $sent_to_admin, $plain_text );
 
 /**
  * Show user-defined additional content - this is set in each email's settings.

templates/emails/customer-notification-manual-trial-ending.php

@@ -51,7 +51,7 @@
 <?php
 
 // Show subscription details.
-\WC_Subscriptions_Order::add_sub_info_email( $order, $sent_to_admin, $plain_text );
+\WC_Subscriptions_Email::subscription_details( $subscription, $order, $sent_to_admin, $plain_text );
 
 /**
  * Show user-defined additional content - this is set in each email's settings.

templates/emails/plain/customer-notification-auto-renewal.php

@@ -40,7 +40,7 @@
 esc_html_e( 'Here are the details:', 'woocommerce-subscriptions' );
 echo "\n";
 // Show subscription details.
-\WC_Subscriptions_Order::add_sub_info_email( $order, $sent_to_admin, $plain_text, true );
+\WC_Subscriptions_Email::subscription_details( $subscription, $order, $sent_to_admin, $plain_text, true );
 
 esc_html_e( 'You can manage this subscription from your account dashboard: ', 'woocommerce-subscriptions' );
 echo esc_url( wc_get_page_permalink( 'myaccount' ) );

templates/emails/plain/customer-notification-auto-trial-ending.php

@@ -46,7 +46,7 @@
 esc_html_e( 'Here are the details:', 'woocommerce-subscriptions' );
 
 // Show subscription details.
-\WC_Subscriptions_Order::add_sub_info_email( $order, $sent_to_admin, $plain_text, true );
+\WC_Subscriptions_Email::subscription_details( $subscription, $order, $sent_to_admin, $plain_text, true );
 
 echo "\n\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n";
 

templates/emails/plain/customer-notification-expiring-subscription.php

@@ -40,7 +40,7 @@
 esc_html_e( 'Here are the details:', 'woocommerce-subscriptions' );
 
 // Show subscription details.
-\WC_Subscriptions_Order::add_sub_info_email( $order, $sent_to_admin, $plain_text, true );
+\WC_Subscriptions_Email::subscription_details( $subscription, $order, $sent_to_admin, $plain_text, true );
 
 /**
  * Show user-defined additional content - this is set in each email's settings.