Update merge tags.

Setting up if the contact name field is active for billing.
Normally it would be first and last name.

diff --git a/models/admin/billing/notifications.php b/models/admin/billing/notifications.php
index 6d8a67a..6569016 100644 (file)
--- a/models/admin/billing/notifications.php
+++ b/models/admin/billing/notifications.php
@@ -302,22 +302,25 @@ class GlmMembersAdmin_billing_notifications extends GlmDataNotificationTypes
                 'data'             => false
             );
         }
-        $mergeTagsBilling = array(
-            'Name of Account', '{$account.name}',
-            'Billing First Name', '{$account.fname}',
-            'Billing Last Name', '{$account.lname}',
-            'Billing Address Line 1', '{$account.addr1}',
-            'Billing Address Line 2', '{$account.addr2}',
-            'Billing City', '{$account.city}',
-            'Billing State', '{$account.state}',
-            'Billing Zip', '{$account.zip}',
-            'Billing Email', '{$account.email}',
-            'Billing Phone', '{$account.phone}',
-            'Billing Company', '{$account.company}',
-            'Billing Position', '{$account.position}',
-            'Renewal Date', '{$account.renewal_date}',
-            'Current Due Amount', '{$account.current_due}',
-        );
+        $mergeTagsBilling[] = 'Name of Account'; $mergeTagsBilling[] = '{$account.name}';
+        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 Address Line 1'; $mergeTagsBilling[] = '{$account.addr1}';
+        $mergeTagsBilling[] = 'Billing Address Line 2'; $mergeTagsBilling[] = '{$account.addr2}';
+        $mergeTagsBilling[] = 'Billing City'; $mergeTagsBilling[] = '{$account.city}';
+        $mergeTagsBilling[] = 'Billing State'; $mergeTagsBilling[] = '{$account.state}';
+        $mergeTagsBilling[] = 'Billing Zip'; $mergeTagsBilling[] = '{$account.zip}';
+        $mergeTagsBilling[] = 'Billing Email'; $mergeTagsBilling[] = '{$account.email}';
+        $mergeTagsBilling[] = 'Billing Phone'; $mergeTagsBilling[] = '{$account.phone}';
+        $mergeTagsBilling[] = 'Billing Company'; $mergeTagsBilling[] = '{$account.company}';
+        $mergeTagsBilling[] = 'Billing Position'; $mergeTagsBilling[] = '{$account.position}';
+        $mergeTagsBilling[] = 'Renewal Date'; $mergeTagsBilling[] = '{$account.renewal_date}';
+        $mergeTagsBilling[] = 'Current Due Amount'; $mergeTagsBilling[] = '{$account.current_due}';
+
         $mergeTagsInvoice = array(
             'Invoice Amount', '{$data.amount}',
         );