From 42e55e97309df8cfb8342e29706800302bce7470 Mon Sep 17 00:00:00 2001 From: David Parker Date: Fri, 14 Feb 2025 09:49:34 -0500 Subject: [PATCH] Fixing the expiration date for the invoice email --- .../class-pmpro-email-template-payment-receipt.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/classes/email-templates/class-pmpro-email-template-payment-receipt.php b/classes/email-templates/class-pmpro-email-template-payment-receipt.php index 38f8c8bb3..8f949d90b 100644 --- a/classes/email-templates/class-pmpro-email-template-payment-receipt.php +++ b/classes/email-templates/class-pmpro-email-template-payment-receipt.php @@ -181,7 +181,11 @@ public function get_email_template_variables() { if( $order->user_id != $user->ID ) { $user = get_userdata( $order->user_id ); } - $membership_level = pmpro_getLevel( $order->membership_id ); + + $membership_level = pmpro_getSpecificMembershipLevelForUser( $user->ID, $order->membership_id ); + if ( empty( $membership_level ) ) { + $membership_level = pmpro_getLevel( $order->membership_id ); + } //Get discount code if it exists $discount_code = ""; @@ -192,11 +196,9 @@ public function get_email_template_variables() { } //Get membership expiration date - $enddate = $wpdb->get_var("SELECT UNIX_TIMESTAMP(CONVERT_TZ(enddate, '+00:00', @@global.time_zone)) FROM $wpdb->pmpro_memberships_users WHERE user_id = '" . $user->ID . "' AND status = 'active' LIMIT 1"); - if( $enddate ) { - $membership_expiration = "

" . sprintf(__("This membership will expire on %s.", 'paid-memberships-pro' ), date_i18n(get_option('date_format'), $enddate)) . "

\n"; - } else { - $membership_expiration = ""; + $membership_expiration = ''; + if( ! empty( $membership_level->enddate ) ) { + $membership_expiration = "

" . sprintf(__("This membership will expire on %s.", 'paid-memberships-pro' ), date_i18n(get_option('date_format'), $membership_level->enddate)) . "

\n"; } $email_template_variables = array(