From aaf613c5c3912d0651606416287cb9f7dacd9ff6 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 27 Jun 2019 15:26:34 -0400 Subject: [PATCH] Updating merge tags on edit page for notifications Adding the new ones for current due and renewal date. --- classes/notifications.php | 2 +- models/admin/settings/notificationTypes.php | 4 +++- views/admin/billing/memberBillingSubHeader.html | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/classes/notifications.php b/classes/notifications.php index f59bf92..f7841a6 100644 --- a/classes/notifications.php +++ b/classes/notifications.php @@ -160,7 +160,7 @@ class GlmNotifications 'fax' => $contactData['fax'], ), ); - echo '
$account_data: ' . print_r( $account_data, true ) . '
'; + // echo '
$account_data: ' . print_r( $account_data, true ) . '
'; // Merge any data passed into this method $account_data['data'] = $data; diff --git a/models/admin/settings/notificationTypes.php b/models/admin/settings/notificationTypes.php index 706fa2b..f10cc4a 100644 --- a/models/admin/settings/notificationTypes.php +++ b/models/admin/settings/notificationTypes.php @@ -255,6 +255,8 @@ class GlmMembersAdmin_settings_notificationTypes extends GlmDataNotificationType 'Billing Phone', '{$account.phone}', 'Billing Company', '{$account.company}', 'Billing Position', '{$account.position}', + 'Renewal Date', '{$account.renewal_date}', + 'Current Due Amount', '{$account.current_due}', ); $mergeTagsInvoice = array( 'Invoice Amount', '{$data.amount}', @@ -273,7 +275,7 @@ class GlmMembersAdmin_settings_notificationTypes extends GlmDataNotificationType 'Contact Company', '{$contact.company}', 'Contact Position', '{$contact.position}', 'Contact Email', '{$contact.email}', - 'Contact Phone', '{$contact.office_phone}', + 'Contact Office Phone', '{$contact.office_phone}', 'Contact Mobile Phone', '{$contact.mobile_phone}', ); // Compile template data diff --git a/views/admin/billing/memberBillingSubHeader.html b/views/admin/billing/memberBillingSubHeader.html index 14bbd41..0e007af 100644 --- a/views/admin/billing/memberBillingSubHeader.html +++ b/views/admin/billing/memberBillingSubHeader.html @@ -32,9 +32,11 @@ href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=billing&member={$memberID}&option=makepayment" class="">Pay Invoices + {* Testing Email Notifications
  • Test Notices
  • + *} -- 2.17.1