From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 16 Jul 2018 14:43:52 +0000 (-0400)
Subject: Update billing notices merge tags.
X-Git-Tag: v1.0.7^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=251775c59979bdd4a074553cf529dd82380a60b1;p=WP-Plugins%2Fglm-member-db-billing.git

Update billing notices merge tags.

Adding Billing First and Last names.
Adding notes to where the {$data} merge tags can be used.
---

diff --git a/classes/notifications.php b/classes/notifications.php
index b1f91cb..5ecf746 100644
--- a/classes/notifications.php
+++ b/classes/notifications.php
@@ -119,14 +119,16 @@ class GlmNotifications
 
         $account_data = array(
             'account' => array(
-                'name'  => $account['ref_name'],
-                'email' => $account['email'],
-                'addr1' => $account['billing_addr1'],
-                'addr2' => $account['billing_addr2'],
-                'city'  => $account['billing_city'],
-                'state' => $account['billing_state'],
-                'zip'   => $account['billing_zip'],
-                'phone' => $account['billing_phone'],
+                'name'       => $account['ref_name'],
+                'email'      => $account['email'],
+                'first_name' => $account['billing_fname'],
+                'last_name'  => $account['billing_lname'],
+                'addr1'      => $account['billing_addr1'],
+                'addr2'      => $account['billing_addr2'],
+                'city'       => $account['billing_city'],
+                'state'      => $account['billing_state'],
+                'zip'        => $account['billing_zip'],
+                'phone'      => $account['billing_phone'],
             )
         );
         // Merge any data passed into this method
diff --git a/views/admin/settings/editNotificationType.html b/views/admin/settings/editNotificationType.html
index f306130..1076829 100644
--- a/views/admin/settings/editNotificationType.html
+++ b/views/admin/settings/editNotificationType.html
@@ -142,6 +142,14 @@
                         <th>{literal}{$account.name}{/literal}</th>
                         <td>Name of Account</td>
                     </tr>
+                    <tr>
+                        <th>{literal}{$account.first_name}{/literal}</th>
+                        <td>Billing First Name</td>
+                    </tr>
+                    <tr>
+                        <th>{literal}{$account.last_name}{/literal}</th>
+                        <td>Billing Last Name</td>
+                    </tr>
                     <tr>
                         <th>{literal}{$account.addr1}{/literal}</th>
                         <td>Billing Address 1</td>
@@ -170,10 +178,16 @@
                         <th>{literal}{$account.phone}{/literal}</th>
                         <td>Billing Phone</td>
                     </tr>
+                    <tr>
+                        <td colspan="2">Only available using Immediate Action - Create Invoice</td>
+                    </tr>
                     <tr>
                         <th>{literal}{$data.amount}{/literal}</th>
                         <td>Invoice Amount</td>
                     </tr>
+                    <tr>
+                        <td colspan="2">Only available using Immediate Action - Received Payment</td>
+                    </tr>
                     <tr>
                         <th>{literal}{$data.payment}{/literal}</th>
                         <td>Payment Amount</td>