Merge pull request #3294 from derekashauer/test-email-variables-3166

Test email variables 3166

Author: dparker1005

classes/class.pmproemail.php

@@ -502,7 +502,7 @@ function sendCheckoutAdminEmail($user = NULL, $order = NULL)
 					case 'checkout_free_admin':
 						$email = new PMPro_Email_Template_Checkout_Free_Admin( $user, $order );
 						break;
-					case 'checkout_paid':
+					case 'checkout_paid_admin':
 						$email = new PMPro_Email_Template_Checkout_Paid_Admin( $user, $order );
 						break;
 				}

classes/email-templates/class-pmpro-email-template-checkout-check-admin.php

@@ -138,6 +138,9 @@ public function get_email_template_variables() {
 		$order = $this->order;
 		$user = $this->user;
 		$membership_level = pmpro_getSpecificMembershipLevelForUser( $user->ID, $order->membership_id );
+		if ( empty( $membership_level ) ) {
+			$membership_level = pmpro_getLevel( $order->membership_id );
+		}
 
 		$confirmation_in_email = get_pmpro_membership_level_meta( $membership_level->id, 'confirmation_in_email', true );
 		if ( ! empty( $confirmation_in_email ) ) {

classes/email-templates/class-pmpro-email-template-checkout-check.php

@@ -173,6 +173,10 @@ public function get_email_template_variables() {
 		$order = $this->order;
 		$user = $this->user;
 		$membership_level = pmpro_getSpecificMembershipLevelForUser( $user->ID, $order->membership_id );
+		if ( empty( $membership_level ) ) {
+			$membership_level = pmpro_getLevel( $order->membership_id );
+		}
+
 		$discount_code = "";
 		if( $order->getDiscountCode() ) {
 			$discount_code = "<p>" . __("Discount Code", 'paid-memberships-pro' ) . ": " . $order->discount_code->code . "</p>\n";

classes/email-templates/class-pmpro-email-template-checkout-free-admin.php

@@ -156,6 +156,9 @@ public function get_email_template_variables() {
 		$order = $this->order;
 		$user = $this->user;
 		$membership_level = pmpro_getSpecificMembershipLevelForUser( $user->ID, $order->membership_id );
+		if ( empty( $membership_level ) ) {
+			$membership_level = pmpro_getLevel( $order->membership_id );
+		}
 
 		$confirmation_message = '';
 		$confirmation_in_email = get_pmpro_membership_level_meta( $membership_level->id, 'confirmation_in_email', true );

classes/email-templates/class-pmpro-email-template-checkout-free.php

@@ -153,6 +153,9 @@ public function get_email_template_variables() {
 		$order = $this->order;
 		$user = $this->user;
 		$membership_level = pmpro_getSpecificMembershipLevelForUser( $user->ID, $order->membership_id );
+		if ( empty( $membership_level ) ) {
+			$membership_level = pmpro_getLevel( $order->membership_id );
+		}
 
 		$confirmation_message = '';
 		$confirmation_in_email = get_pmpro_membership_level_meta( $membership_level->id, 'confirmation_in_email', true );

classes/email-templates/class-pmpro-email-template-checkout-paid-admin.php

@@ -144,6 +144,9 @@ public function get_email_template_variables() {
 		$order = $this->order;
 		$user = $this->user;
 		$membership_level = pmpro_getSpecificMembershipLevelForUser( $user->ID, $order->membership_id );
+		if ( empty( $membership_level ) ) {
+			$membership_level = pmpro_getLevel( $order->membership_id );
+		}
 
 		$confirmation_in_email = get_pmpro_membership_level_meta( $membership_level->id, 'confirmation_in_email', true );
 			if ( ! empty( $confirmation_in_email ) ) {

classes/email-templates/class-pmpro-email-template-checkout-paid.php

@@ -149,6 +149,9 @@ public function get_email_template_variables() {
 		$order = $this->order;
 		$user = $this->user;
 		$membership_level = pmpro_getSpecificMembershipLevelForUser( $user->ID, $order->membership_id );
+		if ( empty( $membership_level ) ) {
+			$membership_level = pmpro_getLevel( $order->membership_id );
+		}
 
 		$confirmation_message = '';
 		$confirmation_in_email = get_pmpro_membership_level_meta( $membership_level->id, 'confirmation_in_email', true );

includes/email.php

@@ -296,14 +296,13 @@ function pmpro_email_templates_send_test() {
 
 	$test_user = $current_user;
 
-
-	//test subscription object
-	$test_subscription = new PMPro_Subscription( array( 'user_id' => $test_user->ID, 'membership_level_id' => $test_user->membership_level->id, 'next_payment_date' => date( 'Y-m-d', strtotime( '+1 month' )  ) )  );
-
 	// Grab the first membership level defined as a "test level" to use
 	$all_levels = pmpro_getAllLevels( true);
 	$test_user->membership_level = array_pop( $all_levels );
 
+	//test subscription object
+	$test_subscription = new PMPro_Subscription( array( 'user_id' => $test_user->ID, 'membership_level_id' => $test_user->membership_level->id, 'next_payment_date' => date( 'Y-m-d', strtotime( '+1 month' )  ) )  );
+
 	//add notice to email body
 	add_filter('pmpro_email_body', 'pmpro_email_templates_test_body', 10, 2);
 
@@ -314,11 +313,11 @@ function pmpro_email_templates_send_test() {
 	switch($test_email->template) {
 		case 'cancel':
 			$send_email = 'sendCancelEmail';
-			$params = array($test_user);
+			$params = array($test_user, $test_user->membership_level->id);
 			break;
 		case 'cancel_admin':
 			$send_email = 'sendCancelAdminEmail';
-			$params = array($current_user, $current_user->membership_level->id);
+			$params = array($test_user, $test_user->membership_level->id);
 			break;
 		case 'cancel_on_next_payment_date':
 		case 'cancel_on_next_payment_date_admin':