From: Steve Sutton Date: Mon, 10 Jun 2019 19:38:21 +0000 (-0400) Subject: Working on more replacement for messages. X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=fb1838c591aad482a7f35a48a21a6cd31629d62f;p=WP-Plugins%2Fglm-member-db-messages.git Working on more replacement for messages. Setting up contact address and phone numbers for mail merge. --- diff --git a/models/admin/ajax/newsletter.php b/models/admin/ajax/newsletter.php index b7e1a7a..e7d10cd 100644 --- a/models/admin/ajax/newsletter.php +++ b/models/admin/ajax/newsletter.php @@ -79,8 +79,16 @@ class GlmMembersAdmin_ajax_newsletter extends GlmDataEmailMessages 'name' => 'Test Member', ), 'contact' => array( - 'fname' => 'John', - 'lname' => 'Doe', + 'fname' => 'John', + 'lname' => 'Doe', + 'addr1' => '120 E Lake St.', + 'addr2' => 'P.O. Box 20', + 'city' => 'Petoskey', + 'state' => 'MI', + 'zip' => '49770', + 'office_phone' => '(231) 555-1234', + 'home_phone' => '(231) 555-4242', + 'mobile_phone' => '(231) 555-2424', ), ); $smarty = new smartyTemplateSupport(); diff --git a/models/admin/messages/index.php b/models/admin/messages/index.php index e5553dc..aa4584d 100644 --- a/models/admin/messages/index.php +++ b/models/admin/messages/index.php @@ -130,6 +130,7 @@ class GlmMembersAdmin_messages_index extends GlmDataEmailMessages $mTypeSelected = false; $whereParts = array(); $catsToUse = array(); + $emailsQueued = false; wp_enqueue_style( 'select2','https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/css/select2.min.css' ); wp_enqueue_script( 'select2js', 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js' ); @@ -274,6 +275,7 @@ class GlmMembersAdmin_messages_index extends GlmDataEmailMessages if ( $option2 === 'sendMessages' && isset( $_REQUEST['message_id'] ) && $messageId = filter_var( $_REQUEST['message_id'], FILTER_VALIDATE_INT ) ) { $this->sendHtmlMessages( $searchResults, $messageId ); + $emailsQueued = true; } } @@ -306,6 +308,7 @@ class GlmMembersAdmin_messages_index extends GlmDataEmailMessages 'states' => $states, 'cities' => $cities, 'counties' => $counties, + 'emailsQueued' => $emailsQueued, ); break; @@ -323,10 +326,19 @@ class GlmMembersAdmin_messages_index extends GlmDataEmailMessages 'name' => 'Test Member', ), 'contact' => array( - 'fname' => 'John', - 'lname' => 'Doe', + 'fname' => 'John', + 'lname' => 'Doe', + 'addr1' => '120 E Lake St.', + 'addr2' => 'P.O. Box 20', + 'city' => 'Petoskey', + 'state' => 'MI', + 'zip' => '49770', + 'office_phone' => '(231) 555-1234', + 'home_phone' => '(231) 555-4242', + 'mobile_phone' => '(231) 555-2424', ), ); + // echo '
$emailData: ' . print_r( $emailData, true ) . '
'; $smarty = new smartyTemplateSupport(); require GLM_MEMBERS_PLUGIN_SETUP_PATH . '/standardTemplateParams.php'; if ( is_array( $emailData ) && count( $emailData ) > 0 ) { @@ -462,18 +474,28 @@ class GlmMembersAdmin_messages_index extends GlmDataEmailMessages $whereParts[] = "T.active = true"; $whereParts[] = "T.email like '%@%'"; $where = implode( " AND ", $whereParts ); - $memberContacts = $Contacts->getSimplified( $where ); + $memberContacts = $Contacts->getList( $where ); if ( $memberContacts && !empty( $memberContacts ) ) { foreach ( $memberContacts as $contact ) { + // echo '
$contact: ' . print_r( $contact, true ) . '
'; $emailData = array( 'member' => array( 'name' => $memData['member'], ), 'contact' => array( - 'fname' => $contact['fname'], - 'lname' => $contact['lname'], + 'fname' => $contact['fname'], + 'lname' => $contact['lname'], + 'addr1' => $contact['addr1'], + 'addr2' => $contact['addr2'], + 'city' => $contact['city'], + 'state' => $contact['state']['value'], + 'zip' => $contact['zip'], + 'office_phone' => $contact['office_phone'], + 'home_phone' => $contact['home_phone'], + 'mobile_phone' => $contact['mobile_phone'], ) ); + // echo '
$emailData: ' . print_r( $emailData, true ) . '
'; $messageBody = $this->generateHTML( $emailData, wpautop( $message['message_body'] ), $message['template_id']['value'] ); // echo '
$messageBody: ' . print_r( $messageBody, true ) . '
'; diff --git a/views/admin/footer.html b/views/admin/footer.html index 6029dc1..7221530 100644 --- a/views/admin/footer.html +++ b/views/admin/footer.html @@ -1,11 +1,12 @@ +
{$glmPluginName}
Copyright © 2014-{$thisYear} Gaslight Media - All Rights Reserved
Phone: 231-487-0692 - E-Mail: info@gaslightmedia.com
http://www.gaslightmedia.com
- - - \ No newline at end of file + + + diff --git a/views/admin/header.html b/views/admin/header.html index 25b377b..959bfb0 100644 --- a/views/admin/header.html +++ b/views/admin/header.html @@ -1,11 +1,8 @@
- - {* Navigation *} - +

Member Communication

Search Members/Contacts/Profiles Email Messages Email Templates

- -
+
diff --git a/views/admin/messages/editHtmlEmail.html b/views/admin/messages/editHtmlEmail.html index 9819125..2a2e28c 100644 --- a/views/admin/messages/editHtmlEmail.html +++ b/views/admin/messages/editHtmlEmail.html @@ -1,5 +1,5 @@ -

Html Email

{include file='admin/header.html'} +

Html Email

@@ -88,6 +88,38 @@ {literal}{$contact.lname}{/literal} Contact Last Name + + {literal}{$contact.addr1}{/literal} + Contact Address Line 1 + + + {literal}{$contact.addr1}{/literal} + Contact Address Line 1 + + + {literal}{$contact.city}{/literal} + Contact City + + + {literal}{$contact.state}{/literal} + Contact State + + + {literal}{$contact.zip}{/literal} + Contact Zip + + + {literal}{$contact.office_phone}{/literal} + Contact Office Phone + + + {literal}{$contact.home_phone}{/literal} + Contact Home Phone + + + {literal}{$contact.mobile_phone}{/literal} + Contact Mobile Phone + diff --git a/views/admin/messages/editTemplate.html b/views/admin/messages/editTemplate.html index be76075..7eec3ce 100644 --- a/views/admin/messages/editTemplate.html +++ b/views/admin/messages/editTemplate.html @@ -1,5 +1,5 @@ -

Html Email

{include file='admin/header.html'} +

Html Email

diff --git a/views/admin/messages/index.html b/views/admin/messages/index.html index 00a79db..0f92075 100644 --- a/views/admin/messages/index.html +++ b/views/admin/messages/index.html @@ -1,7 +1,7 @@ -

Messages Dashboard

- {include file='admin/header.html'} +

Messages Dashboard

+
diff --git a/views/admin/messages/list.html b/views/admin/messages/list.html index 5a999ab..e6ac216 100644 --- a/views/admin/messages/list.html +++ b/views/admin/messages/list.html @@ -1,5 +1,5 @@ -

List Messages

{include file='admin/header.html'} +

List Messages

Add Message diff --git a/views/admin/messages/listMessagesTable.html b/views/admin/messages/listMessagesTable.html index 2929d22..5a3b6bf 100644 --- a/views/admin/messages/listMessagesTable.html +++ b/views/admin/messages/listMessagesTable.html @@ -18,7 +18,7 @@ {$message.last_updated.timestamp|date_format:"%D %r"} {$message.sent|date_format:"%D %r"} {$message.stats|date_format:"%D %r"} - Preview Template + Preview {/foreach} {/if} diff --git a/views/admin/messages/listTemplates.html b/views/admin/messages/listTemplates.html index e58218f..7ffe932 100644 --- a/views/admin/messages/listTemplates.html +++ b/views/admin/messages/listTemplates.html @@ -1,5 +1,5 @@ -

List Messages

{include file='admin/header.html'} +

List Templates

Add Template @@ -17,7 +17,7 @@ {$template.id} {$template.name} - Preview Template + Preview {/foreach} {/if} diff --git a/views/admin/messages/search.html b/views/admin/messages/search.html index 8b5429f..04805ba 100644 --- a/views/admin/messages/search.html +++ b/views/admin/messages/search.html @@ -1,6 +1,5 @@ -

Search Members

- {include file='admin/header.html'} +

Search Members

{if $searchResults} @@ -164,6 +163,8 @@ {/if} +{if $emailsQueued}Emails Queued{/if} + {if $searchResults} @@ -181,4 +182,13 @@
{/if} + + {include file='admin/footer.html'}