From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 2 Oct 2019 19:02:30 +0000 (-0400)
Subject: Update notice merge tags
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=adff6ffad8ea4f5a390e65b7bfb327cdf0dd7c3f;p=WP-Plugins%2Fglm-member-db-billing.git

Update notice merge tags

should be fname and lname
---

diff --git a/classes/notifications.php b/classes/notifications.php
index 60cff78..7feee99 100644
--- a/classes/notifications.php
+++ b/classes/notifications.php
@@ -190,8 +190,8 @@ class GlmNotifications
                 'account'          => array(
                     'name'         => $account['ref_name'],
                     'email'        => $account['email'],
-                    'first_name'   => $account['billing_fname'],
-                    'last_name'    => $account['billing_lname'],
+                    'fname'        => $account['billing_fname'],
+                    'lname'        => $account['billing_lname'],
                     'addr1'        => $account['billing_addr1'],
                     'addr2'        => $account['billing_addr2'],
                     'city'         => $account['billing_city'],
diff --git a/models/admin/billing/notifications.php b/models/admin/billing/notifications.php
index 6569016..114eca4 100644
--- a/models/admin/billing/notifications.php
+++ b/models/admin/billing/notifications.php
@@ -306,8 +306,8 @@ class GlmMembersAdmin_billing_notifications extends GlmDataNotificationTypes
         if ( $this->config['settings']['billing_contact_name_enabled'] ) {
             $mergeTagsBilling[] = 'Billing Contact Name'; $mergeTagsBilling[] = '{$account.billing_contact_name}';
         } else {
-            $mergeTagsBilling[] = 'Billing First Name'; $mergeTagsBilling[] = '{$account.billing_fname}';
-            $mergeTagsBilling[] = 'Billing Last Name'; $mergeTagsBilling[] = '{$account.billing_lname}';
+            $mergeTagsBilling[] = 'Billing First Name'; $mergeTagsBilling[] = '{$account.fname}';
+            $mergeTagsBilling[] = 'Billing Last Name'; $mergeTagsBilling[] = '{$account.lname}';
         }
         $mergeTagsBilling[] = 'Billing Address Line 1'; $mergeTagsBilling[] = '{$account.addr1}';
         $mergeTagsBilling[] = 'Billing Address Line 2'; $mergeTagsBilling[] = '{$account.addr2}';