' : '';
+?>
+
+get_formatted_billing_full_name() ) );
+} else {
+ /* translators: $1: customer's first name and last name, $2: how many subscriptions customer switched */
+ echo esc_html( sprintf( _x( 'Customer %1$s has switched %2$d of their subscriptions. The details of their new subscriptions are as follows:', 'Used in switch notification admin email', 'woocommerce-subscriptions' ), $order->get_formatted_billing_full_name(), $switched_count ) );
+}
+?>
+
+' : ''; ?>
@@ -32,13 +57,19 @@ foreach ( $subscriptions as $subscription ) {
do_action( 'woocommerce_subscriptions_email_order_details', $subscription, $sent_to_admin, $plain_text, $email );
}
+/*
+ * @hooked WC_Emails::customer_details() Shows customer details
+ * @hooked WC_Emails::email_address() Shows email address
+ */
do_action( 'woocommerce_email_customer_details', $order, $sent_to_admin, $plain_text, $email );
/**
* Show user-defined additional content - this is set in each email's settings.
*/
if ( $additional_content ) {
+ echo $email_improvements_enabled ? '
' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? '
' : '';
}
do_action( 'woocommerce_email_footer', $email );
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/admin-payment-retry.php b/vendor/woocommerce/subscriptions-core/templates/emails/admin-payment-retry.php
index 9685ce5..f7ce692 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/admin-payment-retry.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/admin-payment-retry.php
@@ -5,23 +5,24 @@
* Email sent to admins when an attempt to automatically process a subscription renewal payment has failed
* and a retry rule has been applied to retry the payment in the future.
*
- * @author Prospress
* @package WooCommerce_Subscriptions/Templates/Emails/Plain
- * @version 1.0.0 - Migrated from WooCommerce Subscriptions v2.6.0
+ * @version 7.3.0 - Updated for WC core email improvements.
*/
-if ( ! defined( 'ABSPATH' ) ) {
- exit;
-}
+defined( 'ABSPATH' ) || exit;
+
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
/**
* @hooked WC_Emails::email_header() Output the email header
*/
do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
+' : ''; ?>
-
get_order_number(), $order->get_formatted_billing_full_name(), wcs_get_human_time_diff( $retry->get_time() ) ) ); ?>
+
get_order_number(), $order->get_formatted_billing_full_name(), wcs_get_human_time_diff( $retry->get_time() ) ) ); ?>
+' : ''; ?>
' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? ' |
' : '';
}
/**
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/cancelled-subscription.php b/vendor/woocommerce/subscriptions-core/templates/emails/cancelled-subscription.php
index 1db81cc..ed457d0 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/cancelled-subscription.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/cancelled-subscription.php
@@ -2,18 +2,36 @@
/**
* Cancelled Subscription email
*
- * @author Prospress
* @package WooCommerce_Subscriptions/Templates/Emails
- * @version 1.0.0 - Migrated from WooCommerce Subscriptions v2.6.0
+ * @version 7.3.0 - Updated for WC core email improvements.
*/
-if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
-}
+
+defined( 'ABSPATH' ) || exit;
+
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
-
-
get_formatted_billing_full_name() ) );?>
+' : ''; ?>
+
+ get_status() ) {
+ printf(
+ /* translators: $1$s customer's billing first name and last name %2$s: date on which the subscription ends. */
+ esc_html__( 'A subscription belonging to %1$s is now pending cancellation, and will end on %2$s. Their subscription\'s details are as follows:', 'woocommerce-subscriptions' ),
+ esc_html( $subscription->get_formatted_billing_full_name() ),
+ esc_html( date_i18n( wc_date_format(), $subscription->get_time( 'end', 'site' ) ) )
+ );
+ } else {
+ printf(
+ /* translators: $1$s customer's billing first name and last name. */
+ esc_html__( 'A subscription belonging to %1$s has been cancelled. Their subscription\'s details are as follows:', 'woocommerce-subscriptions' ),
+ esc_html( $subscription->get_formatted_billing_full_name() )
+ );
+ }
+ ?>
+
+' : ''; ?>
@@ -59,7 +77,9 @@ do_action( 'woocommerce_email_customer_details', $subscription, $sent_to_admin,
* Show user-defined additional content - this is set in each email's settings.
*/
if ( $additional_content ) {
+ echo $email_improvements_enabled ? '' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? ' |
' : '';
}
do_action( 'woocommerce_email_footer', $email );
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/customer-completed-renewal-order.php b/vendor/woocommerce/subscriptions-core/templates/emails/customer-completed-renewal-order.php
index e3f52c0..01de3aa 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/customer-completed-renewal-order.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/customer-completed-renewal-order.php
@@ -2,33 +2,53 @@
/**
* Customer completed renewal order email
*
- * @author Brent Shepherd
+ * Based on the WooCommerce core customer-completed-order.php template.
+ *
* @package WooCommerce_Subscriptions/Templates/Emails
- * @version 1.0.0 - Migrated from WooCommerce Subscriptions v2.6.0
+ * @version 7.3.0 - Updated for WC core email improvements.
*/
-if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
-}
+defined( 'ABSPATH' ) || exit;
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
+
+/*
+ * @hooked WC_Emails::email_header() Output the email header
+ */
do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
+' : ''; ?>
get_billing_first_name() ) ); ?>
+' : ''; ?>
' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? ' |
' : '';
}
do_action( 'woocommerce_email_footer', $email );
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/customer-completed-switch-order.php b/vendor/woocommerce/subscriptions-core/templates/emails/customer-completed-switch-order.php
index acff5d0..2309a06 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/customer-completed-switch-order.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/customer-completed-switch-order.php
@@ -2,24 +2,37 @@
/**
* Customer completed subscription change email
*
- * @author Brent Shepherd
+ * Based on the WooCommerce core customer-completed-order.php template.
+ *
* @package WooCommerce_Subscriptions/Templates/Emails
- * @version 1.0.0 - Migrated from WooCommerce Subscriptions v2.6.0
+ * @version 7.3.0 - Updated for WC core email improvements.
*/
-if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
-}
+defined( 'ABSPATH' ) || exit;
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
+
+/*
+ * @hooked WC_Emails::email_header() Output the email header
+ */
do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
+' : ''; ?>
get_billing_first_name() ) ); ?>
-
+' : ''; ?>
@@ -30,13 +43,19 @@ foreach ( $subscriptions as $subscription ) {
do_action( 'woocommerce_subscriptions_email_order_details', $subscription, $sent_to_admin, $plain_text, $email );
}
+/**
+ * @hooked WC_Emails::customer_details() Shows customer details
+ * @hooked WC_Emails::email_address() Shows email address
+ */
do_action( 'woocommerce_email_customer_details', $order, $sent_to_admin, $plain_text, $email );
/**
* Show user-defined additional content - this is set in each email's settings.
*/
if ( $additional_content ) {
+ echo $email_improvements_enabled ? '
' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? ' |
' : '';
}
do_action( 'woocommerce_email_footer', $email );
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-auto-renewal.php b/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-auto-renewal.php
index 27ac7fe..3f491f2 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-auto-renewal.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-auto-renewal.php
@@ -3,11 +3,12 @@
* Customer Notification: Notify the customer that an automated renewal their subscription is about to happen.
*
* @package WooCommerce_Subscriptions/Templates/Emails
- * @version 7.2.0
+ * @version 7.3.0 - Updated for WC core email improvements.
*/
-if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
-}
+
+defined( 'ABSPATH' ) || exit;
+
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
/**
* @hooked WC_Emails::email_header() Output the email header.
@@ -16,6 +17,7 @@ if ( ! defined( 'ABSPATH' ) ) {
*/
do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
+' : ''; ?>
);
?>
-
-
?>
' : '';
// Show subscription details.
\WC_Subscriptions_Email::subscription_details( $subscription, $order, $sent_to_admin, $plain_text, true );
@@ -84,7 +85,9 @@ do_action( 'woocommerce_subscriptions_email_order_details', $subscription, $sent
* Show user-defined additional content - this is set in each email's settings.
*/
if ( $additional_content ) {
+ echo $email_improvements_enabled ? '
' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? ' |
' : '';
}
/**
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-auto-trial-ending.php b/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-auto-trial-ending.php
index a72aaae..5beb053 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-auto-trial-ending.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-auto-trial-ending.php
@@ -3,19 +3,20 @@
* Customer Notification: Free trial of an automatically renewed subscription is about to expire email.
*
* @package WooCommerce_Subscriptions/Templates/Emails
- * @version 7.2.0
+ * @version 7.3.0 - Updated for WC core email improvements.
*/
-if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
-}
+defined( 'ABSPATH' ) || exit;
+
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
/**
* @hooked WC_Emails::email_header() Output the email header.
*
* @since 6.9.0
*/
-do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
+do_action( 'woocommerce_email_header', $email_heading, $email );
+echo $email_improvements_enabled ? '
' : ''; ?>
);
?>
-
-
);
?>
-
?>
' : '';
// Show subscription details.
\WC_Subscriptions_Email::subscription_details( $subscription, $order, $sent_to_admin, $plain_text, true );
@@ -71,7 +70,9 @@ do_action( 'woocommerce_subscriptions_email_order_details', $subscription, $sent
* Show user-defined additional content - this is set in each email's settings.
*/
if ( $additional_content ) {
+ echo $email_improvements_enabled ? '
' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? ' |
' : '';
}
/**
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-expiring-subscription.php b/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-expiring-subscription.php
index 83be84e..c5b4583 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-expiring-subscription.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-expiring-subscription.php
@@ -3,11 +3,11 @@
* Customer Notification: Subscription is about to expire email.
*
* @package WooCommerce_Subscriptions/Templates/Emails
- * @version 7.2.0
+ * @version 7.3.0 - Updated for WC core email improvements.
*/
-if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
-}
+defined( 'ABSPATH' ) || exit;
+
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
/**
* @hooked WC_Emails::email_header() Output the email header.
@@ -15,8 +15,7 @@ if ( ! defined( 'ABSPATH' ) ) {
* @since 6.9.0
*/
do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
-
-
+' : ''; ?>
' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? ' |
' : '';
}
/**
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-manual-renewal.php b/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-manual-renewal.php
index 8be7221..338d742 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-manual-renewal.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-manual-renewal.php
@@ -3,11 +3,12 @@
* Customer Notification: Manual renewal needed.
*
* @package WooCommerce_Subscriptions/Templates/Emails
- * @version 7.2.0
+ * @version 7.3.0 - Updated for WC core email improvements.
*/
-if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
-}
+
+defined( 'ABSPATH' ) || exit;
+
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
/**
* @hooked WC_Emails::email_header() Output the email header.
@@ -16,7 +17,7 @@ if ( ! defined( 'ABSPATH' ) ) {
*/
do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
-
+' : ''; ?>
' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? ' |
' : '';
}
/**
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-manual-trial-ending.php b/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-manual-trial-ending.php
index d848c50..3fca94b 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-manual-trial-ending.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/customer-notification-manual-trial-ending.php
@@ -3,19 +3,20 @@
* Customer Notification: Free trial of a manually renewed subscription is about to expire email.
*
* @package WooCommerce_Subscriptions/Templates/Emails
- * @version 7.2.0
+ * @version 7.3.0 - Updated for WC core email improvements.
*/
-if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
-}
+defined( 'ABSPATH' ) || exit;
+
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
/**
* @hooked WC_Emails::email_header() Output the email header.
*
* @since 6.9.0
*/
-do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
+do_action( 'woocommerce_email_header', $email_heading, $email );
+echo $email_improvements_enabled ? '
' : ''; ?>
);
?>
-
-
);
?>
-
-
-
' : '';
// Show subscription details.
\WC_Subscriptions_Email::subscription_details( $subscription, $order, $sent_to_admin, $plain_text );
@@ -60,7 +57,9 @@ do_action( 'woocommerce_subscriptions_email_order_details', $subscription, $sent
* Show user-defined additional content - this is set in each email's settings.
*/
if ( $additional_content ) {
+ echo $email_improvements_enabled ? '
' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? ' |
' : '';
}
/**
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/customer-on-hold-renewal-order.php b/vendor/woocommerce/subscriptions-core/templates/emails/customer-on-hold-renewal-order.php
index 8835675..0311cbc 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/customer-on-hold-renewal-order.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/customer-on-hold-renewal-order.php
@@ -3,21 +3,24 @@
* Customer on-hold renewal order email.
*
* @package WooCommerce_Subscriptions/Templates/Emails
- * @version 1.0.0 - Migrated from WooCommerce Subscriptions v3.0.0
+ * @version 7.3.0 - Updated for WC core email improvements.
*/
defined( 'ABSPATH' ) || exit;
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
+
/*
* @hooked WC_Emails::email_header() Output the email header
*/
-do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
+do_action( 'woocommerce_email_header', $email_heading, $email );
-
+echo $email_improvements_enabled ? '
' : '';
+/* translators: %s: Customer first name */ ?>
get_billing_first_name() ) ); ?>
-
' : '';
/*
* @hooked WC_Subscriptions_Email::order_download_details() Shows the order details table.
@@ -40,7 +43,9 @@ do_action( 'woocommerce_email_customer_details', $order, $sent_to_admin, $plain_
* Show user-defined additional content - this is set in each email's settings.
*/
if ( $additional_content ) {
+ echo $email_improvements_enabled ? '
' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? ' |
' : '';
}
/*
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/customer-payment-retry.php b/vendor/woocommerce/subscriptions-core/templates/emails/customer-payment-retry.php
index abc6e14..7522661 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/customer-payment-retry.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/customer-payment-retry.php
@@ -2,23 +2,26 @@
/**
* Customer payment retry email
*
- * @author Prospress
* @package WooCommerce_Subscriptions/Templates/Emails
- * @version 1.0.0 - Migrated from WooCommerce Subscriptions v2.6.0
+ * @version 7.3.0 - Updated for WC core email improvements.
*/
-if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
-}
+defined( 'ABSPATH' ) || exit;
-do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
-
+do_action( 'woocommerce_email_header', $email_heading, $email );
+
+echo $email_improvements_enabled ? '
' : '';
+
+/* translators: %s: Customer first name */ ?>
get_billing_first_name() ) ); ?>
get_time() ) ) ); ?>
-
get_checkout_payment_url() ) . '">', '' ), array( 'a' => array( 'href' => true ) ) );?>
+
get_checkout_payment_url() ) . '">', '' ), array( 'a' => array( 'href' => true ) ) ); ?>
+
+' : ''; ?>
' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? '
' : '';
}
do_action( 'woocommerce_email_footer', $email );
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/customer-processing-renewal-order.php b/vendor/woocommerce/subscriptions-core/templates/emails/customer-processing-renewal-order.php
index edaed15..d73f3f9 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/customer-processing-renewal-order.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/customer-processing-renewal-order.php
@@ -2,23 +2,25 @@
/**
* Customer processing renewal order email
*
- * @author Brent Shepherd
* @package WooCommerce_Subscriptions/Templates/Emails
- * @version 1.0.0 - Migrated from WooCommerce Subscriptions v2.6.0
+ * @version 7.3.0 - Updated for WC core email improvements.
*/
+defined( 'ABSPATH' ) || exit;
-if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
-}
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
-do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
+do_action( 'woocommerce_email_header', $email_heading, $email );
-
+echo $email_improvements_enabled ? '
' : '';
+
+/* translators: %s: Customer first name */ ?>
get_billing_first_name() ) ); ?>
get_order_number() ) ); ?>
-
' : '';
+
do_action( 'woocommerce_subscriptions_email_order_details', $order, $sent_to_admin, $plain_text, $email );
do_action( 'woocommerce_email_order_meta', $order, $sent_to_admin, $plain_text, $email );
@@ -29,7 +31,9 @@ do_action( 'woocommerce_email_customer_details', $order, $sent_to_admin, $plain_
* Show user-defined additional content - this is set in each email's settings.
*/
if ( $additional_content ) {
+ echo $email_improvements_enabled ? '
' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? ' |
' : '';
}
do_action( 'woocommerce_email_footer', $email );
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/customer-renewal-invoice.php b/vendor/woocommerce/subscriptions-core/templates/emails/customer-renewal-invoice.php
index 5b63588..424ec21 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/customer-renewal-invoice.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/customer-renewal-invoice.php
@@ -2,39 +2,68 @@
/**
* Customer renewal invoice email
*
- * @author Brent Shepherd
* @package WooCommerce_Subscriptions/Templates/Emails
- * @version 1.0.0 - Migrated from WooCommerce Subscriptions v2.6.0
+ * @version 7.3.0 - Updated for WC core email improvements.
*/
-if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
-}
+defined( 'ABSPATH' ) || exit;
-do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
-
+do_action( 'woocommerce_email_header', $email_heading, $email );
+
+echo $email_improvements_enabled ? '
' : '';
+
+/* translators: %s: Customer first name */ ?>
get_billing_first_name() ) ); ?>
has_status( 'pending' ) ) : ?>
-
get_checkout_payment_url() ) . '">' . esc_html__( 'Pay Now »', 'woocommerce-subscriptions' ) . ''
- ), array( 'a' => array( 'href' => true ) ) ); ?>
+
+ get_checkout_payment_url() ) . '">'
+ . esc_html__( 'Pay Now »', 'woocommerce-subscriptions' ) .
+ ''
+ ),
+ [
+ 'a' => [ 'href' => true ],
+ ]
+ );
+ ?>
has_status( 'failed' ) ) : ?>
-
get_checkout_payment_url() ) . '">' . esc_html__( 'Pay Now »', 'woocommerce-subscriptions' ) . ''
- ), array( 'a' => array( 'href' => true ) ) ); ?>
+
+ get_checkout_payment_url() ) . '">'
+ . esc_html__( 'Pay Now »', 'woocommerce-subscriptions' ) .
+ ''
+ ),
+ [
+ 'a' => [ 'href' => true ],
+ ]
+ );
+ ?>
+' : ''; ?>
+
' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? '
' : '';
}
do_action( 'woocommerce_email_footer', $email );
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/email-order-details.php b/vendor/woocommerce/subscriptions-core/templates/emails/email-order-details.php
index c68c597..1b0dcb5 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/email-order-details.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/email-order-details.php
@@ -2,35 +2,66 @@
/**
* Order/Subscription details table shown in emails.
*
- * @author Prospress
+ * Based on the WooCommerce core email-order-details.php template.
+ *
* @package WooCommerce_Subscriptions/Templates/Emails
- * @version 1.0.0 - Migrated from WooCommerce Subscriptions v3.0.0
+ * @version 7.3.0
*/
-if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
-}
+
+defined( 'ABSPATH' ) || exit;
$text_align = is_rtl() ? 'right' : 'left';
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
+$heading_class = $email_improvements_enabled ? 'email-order-detail-heading' : '';
+$order_table_class = $email_improvements_enabled ? 'email-order-details' : '';
+$order_total_text_align = $email_improvements_enabled ? 'right' : 'left';
+
+if ( $email_improvements_enabled ) {
+ add_filter( 'woocommerce_order_shipping_to_display_shipped_via', '__return_false' );
+}
+
do_action( 'woocommerce_email_before_' . $order_type . '_table', $order, $sent_to_admin, $plain_text, $email );
-if ( 'cancelled_subscription' != $email->id ) {
- echo '
';
+if ( 'cancelled_subscription' !== $email->id ) {
+ echo '';
}
?>
-
-
+
+
+
|
@@ -38,30 +69,53 @@ if ( 'cancelled_subscription' != $email->id ) {
|
+
get_order_item_totals() ) {
+ $item_totals = $order->get_order_item_totals();
+ $item_totals_count = count( $item_totals );
+
+ if ( $item_totals ) {
$i = 0;
- foreach ( $totals as $total ) {
+ foreach ( $item_totals as $total ) {
$i++;
+ $last_class = ( $i === $item_totals_count ) ? ' order-totals-last' : '';
?>
-
- |
- |
+
+
+
+ |
+ |
get_customer_note() ) {
- ?>
-
- |
- get_customer_note() ) ); ?> |
-
-
+
+
+
+ get_customer_note() ) ), array( 'br' => array() ) ); ?>
+ |
+
+
+
+ |
+ get_customer_note() ) ), array() ); ?> |
+
+
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/expired-subscription.php b/vendor/woocommerce/subscriptions-core/templates/emails/expired-subscription.php
index f1408c3..3ba022c 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/expired-subscription.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/expired-subscription.php
@@ -2,18 +2,21 @@
/**
* Cancelled Subscription email
*
- * @author Prospress
* @package WooCommerce_Subscriptions/Templates/Emails
- * @version 1.0.0 - Migrated from WooCommerce Subscriptions v2.6.0
+ * @version 7.3.0 - Updated for WC core email improvements.
*/
-if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
-}
+defined( 'ABSPATH' ) || exit;
-do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
-
-get_formatted_billing_full_name() ) );?>
+do_action( 'woocommerce_email_header', $email_heading, $email );
+
+echo $email_improvements_enabled ? '' : '';
+
+/* translators: $1: customer's billing first name and last name */ ?>
+
get_formatted_billing_full_name() ) ); ?>
+
+' : ''; ?>
@@ -60,7 +63,9 @@ do_action( 'woocommerce_email_customer_details', $subscription, $sent_to_admin,
* Show user-defined additional content - this is set in each email's settings.
*/
if ( $additional_content ) {
+ echo $email_improvements_enabled ? '' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? ' |
' : '';
}
do_action( 'woocommerce_email_footer', $email );
diff --git a/vendor/woocommerce/subscriptions-core/templates/emails/on-hold-subscription.php b/vendor/woocommerce/subscriptions-core/templates/emails/on-hold-subscription.php
index 0c8f323..c41489a 100644
--- a/vendor/woocommerce/subscriptions-core/templates/emails/on-hold-subscription.php
+++ b/vendor/woocommerce/subscriptions-core/templates/emails/on-hold-subscription.php
@@ -2,18 +2,21 @@
/**
* Cancelled Subscription email
*
- * @author Prospress
* @package WooCommerce_Subscriptions/Templates/Emails
- * @version 1.0.0 - Migrated from WooCommerce Subscriptions v2.6.0
+ * @version 7.3.0 - Updated for WC core email improvements.
*/
-if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
-}
+defined( 'ABSPATH' ) || exit;
-do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
+$email_improvements_enabled = wcs_is_wc_feature_enabled( 'email_improvements' );
-
-get_formatted_billing_full_name() ) );?>
+do_action( 'woocommerce_email_header', $email_heading, $email );
+
+echo $email_improvements_enabled ? '' : '';
+
+/* translators: $1: customer's billing first name and last name */ ?>
+
get_formatted_billing_full_name() ) ); ?>
+
+' : ''; ?>
@@ -59,7 +62,9 @@ do_action( 'woocommerce_email_customer_details', $subscription, $sent_to_admin,
* Show user-defined additional content - this is set in each email's settings.
*/
if ( $additional_content ) {
+ echo $email_improvements_enabled ? '' : '';
echo wp_kses_post( wpautop( wptexturize( $additional_content ) ) );
+ echo $email_improvements_enabled ? ' |
' : '';
}
do_action( 'woocommerce_email_footer', $email );
diff --git a/vendor/woocommerce/subscriptions-core/wcs-functions.php b/vendor/woocommerce/subscriptions-core/wcs-functions.php
index e7babbb..7d2a709 100644
--- a/vendor/woocommerce/subscriptions-core/wcs-functions.php
+++ b/vendor/woocommerce/subscriptions-core/wcs-functions.php
@@ -342,7 +342,7 @@ function wcs_get_date_meta_key( $date_type ) {
* deprecated date type key.
*
* @since 1.0.0 - Migrated from WooCommerce Subscriptions v2.2.0
- * @param string $date_type_key String referring to a valid date type, can be: 'date_created', 'trial_end', 'next_payment', 'last_order_date_created' or 'end', or any other value returned by @see this->get_valid_date_types()
+ * @param string $date_type_key String referring to a valid date type, can be: 'date_created', 'trial_end', 'next_payment', 'last_order_date_created' or 'end', or any other value returned by @see WC_Subscription::get_valid_date_types()
* @return string
*/
function wcs_normalise_date_type_key( $date_type_key, $display_deprecated_notice = false ) {
diff --git a/vendor/woocommerce/subscriptions-core/woocommerce-subscriptions-core.php b/vendor/woocommerce/subscriptions-core/woocommerce-subscriptions-core.php
index 6d66f2f..fc92ce9 100644
--- a/vendor/woocommerce/subscriptions-core/woocommerce-subscriptions-core.php
+++ b/vendor/woocommerce/subscriptions-core/woocommerce-subscriptions-core.php
@@ -6,5 +6,5 @@
* Author: Automattic
* Author URI: https://woocommerce.com/
* Requires WP: 5.6
- * Version: 8.0.1
+ * Version: 8.1.0
*/
diff --git a/woocommerce-subscriptions.php b/woocommerce-subscriptions.php
index 4c4c32e..e5abcf5 100644
--- a/woocommerce-subscriptions.php
+++ b/woocommerce-subscriptions.php
@@ -5,11 +5,11 @@
* Description: Sell products and services with recurring payments in your WooCommerce Store.
* Author: WooCommerce
* Author URI: https://woocommerce.com/
- * Version: 7.2.1
+ * Version: 7.3.0
* Requires Plugins: woocommerce
*
* WC requires at least: 8.7.1
- * WC tested up to: 9.7
+ * WC tested up to: 9.8.0
* Woo: 27147:6115e6d7e297b623a169fdcf5728b224
*
* Copyright 2019 WooCommerce
@@ -78,7 +78,7 @@ class WC_Subscriptions {
public static $plugin_file = __FILE__;
/** @var string */
- public static $version = '7.2.1'; // WRCS: DEFINED_VERSION.
+ public static $version = '7.3.0'; // WRCS: DEFINED_VERSION.
/** @var string */
public static $wc_minimum_supported_version = '7.7';