Skip to content

Commit

Permalink
Merge pull request #3298 from dparker1005/checkout-admin-email-names
Browse files Browse the repository at this point in the history 
Fixing display names shown in admin checkout emails
  • Loading branch information
@kimcoleman
kimcoleman authored Feb 13, 2025
2 parents fcb3f4d + d1fa42d commit 05e76cf
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion classes/email-templates/class-pmpro-email-template-billing-admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public function get_email_template_variables() {
'user_login' => $user->user_login,
'subject' => $this->get_default_subject(),
'user_email' => $user->user_email,
'display_name' => $this->get_recipient_name(),
'display_name' => $user->display_name,
'billing_name' => $order->billing->name,
'billing_street' => $order->billing->street,
'billing_street2' => $order->billing->street2,
Expand Down
12 changes: 6 additions & 6 deletions classes/email-templates/class-pmpro-email-template-checkout-check-admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ public function get_email_template_variables() {

$email_template_variables = array(
'subject' => $this->get_default_subject(),
'name' => $this->get_recipient_name(),
'display_name' => $this->get_recipient_name(),
'name' => $user->display_name,
'display_name' => $user->display_name,
'user_login' => $user->user_login,
'membership_id' => $membership_level->id,
'membership_level_name' => $membership_level->name,
Expand Down Expand Up @@ -211,14 +211,14 @@ public static function get_email_template_variables_with_description() {

return array(
'!!subject!!' => esc_html__( 'The subject of the email.', 'paid-memberships-pro' ),
'!!name!!' => esc_html__( 'The name of the email recipient.', 'paid-memberships-pro' ),
'!!display_name!!' => esc_html__( 'The name of the email recipient.', 'paid-memberships-pro' ),
'!!user_login!!' => esc_html__( 'The login name of the email recipient.', 'paid-memberships-pro' ),
'!!name!!' => esc_html__( 'The name of the purchaser.', 'paid-memberships-pro' ),
'!!display_name!!' => esc_html__( 'The name of the purchaser.', 'paid-memberships-pro' ),
'!!user_login!!' => esc_html__( 'The login name of the purchaser.', 'paid-memberships-pro' ),
'!!membership_id!!' => esc_html__( 'The ID of the membership level.', 'paid-memberships-pro' ),
'!!membership_level_name!!' => esc_html__( 'The name of the membership level.', 'paid-memberships-pro' ),
'!!confirmation_message!!' => esc_html__( 'The confirmation message for the membership level.', 'paid-memberships-pro' ),
'!!membership_cost!!' => esc_html__( 'The cost of the membership level.', 'paid-memberships-pro' ),
'!!user_email!!' => esc_html__( 'The email address of the email recipient.', 'paid-memberships-pro' ),
'!!user_email!!' => esc_html__( 'The email address of the purchaser.', 'paid-memberships-pro' ),
);
}

Expand Down
12 changes: 6 additions & 6 deletions classes/email-templates/class-pmpro-email-template-checkout-free-admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,14 @@ public static function get_email_template_variables_with_description() {

return array(
'!!subject!!' => esc_html__( 'The subject of the email.', 'paid-memberships-pro' ),
'!!name!!' => esc_html__( 'The name of the email recipient.', 'paid-memberships-pro' ),
'!!display_name!!' => esc_html__( 'The name of the email recipient.', 'paid-memberships-pro' ),
'!!user_login!!' => esc_html__( 'The login name of the email recipient.', 'paid-memberships-pro' ),
'!!name!!' => esc_html__( 'The name of the purchaser.', 'paid-memberships-pro' ),
'!!display_name!!' => esc_html__( 'The name of the purchaser.', 'paid-memberships-pro' ),
'!!user_login!!' => esc_html__( 'The login name of the purchaser.', 'paid-memberships-pro' ),
'!!membership_id!!' => esc_html__( 'The ID of the membership level.', 'paid-memberships-pro' ),
'!!membership_level_name!!' => esc_html__( 'The name of the membership level.', 'paid-memberships-pro' ),
'!!confirmation_message!!' => esc_html__( 'The confirmation message for the membership level.', 'paid-memberships-pro' ),
'!!membership_cost!!' => esc_html__( 'The cost of the membership level.', 'paid-memberships-pro' ),
'!!user_email!!' => esc_html__( 'The email address of the email recipient.', 'paid-memberships-pro' ),
'!!user_email!!' => esc_html__( 'The email address of the purchaser.', 'paid-memberships-pro' ),
'!!membership_expiration!!' => esc_html__( 'The expiration date of the membership level.', 'paid-memberships-pro' ),
'!!discount_code!!' => esc_html__( 'The discount code used for the membership level.', 'paid-memberships-pro' ),
);
Expand Down Expand Up @@ -175,8 +175,8 @@ public function get_email_template_variables() {

$email_template_variables = array(
'subject' => $this->get_default_subject(),
'name' => $this->get_recipient_name(),
'display_name' => $this->get_recipient_name(),
'name' => $user->display_name,
'display_name' => $user->display_name,
'user_login' => $user->user_login,
'membership_id' => $membership_level->id,
'membership_level_name' => $membership_level->name,
Expand Down
12 changes: 6 additions & 6 deletions classes/email-templates/class-pmpro-email-template-checkout-paid-admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ public function get_email_template_variables() {

$email_template_variables = array(
'subject' => $this->get_default_subject(),
'name' => $this->get_recipient_name(),
'display_name' => $this->get_recipient_name(),
'name' => $user->display_name,
'display_name' => $user->display_name,
'user_login' => $user->user_login,
'membership_id' => $membership_level->id,
'membership_level_name' => $membership_level->name,
Expand Down Expand Up @@ -213,14 +213,14 @@ public static function get_email_template_variables_with_description() {

return array(
'!!subject!!' => esc_html__( 'The subject of the email.', 'paid-memberships-pro' ),
'!!name!!' => esc_html__( 'The name of the email recipient.', 'paid-memberships-pro' ),
'!!display_name!!' => esc_html__( 'The name of the email recipient.', 'paid-memberships-pro' ),
'!!user_login!!' => esc_html__( 'The login name of the email recipient.', 'paid-memberships-pro' ),
'!!name!!' => esc_html__( 'The name of the purchaser.', 'paid-memberships-pro' ),
'!!display_name!!' => esc_html__( 'The name of the purchaser.', 'paid-memberships-pro' ),
'!!user_login!!' => esc_html__( 'The login name of the purchaser.', 'paid-memberships-pro' ),
'!!membership_id!!' => esc_html__( 'The ID of the membership level.', 'paid-memberships-pro' ),
'!!membership_level_name!!' => esc_html__( 'The name of the membership level.', 'paid-memberships-pro' ),
'!!confirmation_message!!' => esc_html__( 'The confirmation message for the membership level.', 'paid-memberships-pro' ),
'!!membership_cost!!' => esc_html__( 'The cost of the membership level.', 'paid-memberships-pro' ),
'!!user_email!!' => esc_html__( 'The email address of the email recipient.', 'paid-memberships-pro' ),
'!!user_email!!' => esc_html__( 'The email address of the purchaser.', 'paid-memberships-pro' ),
'!!membership_expiration!!' => esc_html__( 'The expiration date of the membership level.', 'paid-memberships-pro' ),
'!!discount_code!!' => esc_html__( 'The discount code used for the membership level.', 'paid-memberships-pro' ),
'!!order_id!!' => esc_html__( 'The ID of the order.', 'paid-memberships-pro' ),
Expand Down

0 comments on commit 05e76cf

Please sign in to comment.