From 7d80f005462758e0271215240cdf99a9336f03dd Mon Sep 17 00:00:00 2001 From: Christopher Burger Date: Wed, 16 Aug 2017 10:55:56 -0400 Subject: RT# 73964 - Added biling event action to send an email to phone nunber, and updated email a notice to customer to allow emailing to phone number for email_to_voice service. --- httemplate/config/config-view.cgi | 2 +- httemplate/elements/select-cust_phone.html | 31 +++++++++++ httemplate/elements/select.html | 2 +- httemplate/elements/tr-select-cust_phone.html | 12 +++++ httemplate/misc/email-customers.html | 75 +++++++++++++++++++++++---- 5 files changed, 109 insertions(+), 13 deletions(-) create mode 100644 httemplate/elements/select-cust_phone.html create mode 100644 httemplate/elements/tr-select-cust_phone.html (limited to 'httemplate') diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi index edbda5ca9..b02ab1af3 100644 --- a/httemplate/config/config-view.cgi +++ b/httemplate/config/config-view.cgi @@ -435,7 +435,7 @@ my @sections = (qw( important billing payments payment_batching credit_cards e-checks taxation packages suspension cancellation - printing print_services + printing print_services email_to_voice_services invoicing invoice_email invoice_balances invoice_templates quotations notification UI addresses customer_number customer_fields reporting localization scalability backup diff --git a/httemplate/elements/select-cust_phone.html b/httemplate/elements/select-cust_phone.html new file mode 100644 index 000000000..94cd41322 --- /dev/null +++ b/httemplate/elements/select-cust_phone.html @@ -0,0 +1,31 @@ + + +<%init> + +my %opt = @_; +my $cust_num = $opt{'cust_num'}; +my $phone_types = $opt{'phone_types'}; +my $format = $opt{'format'}; + +my $cust_phones = qsearchs('cust_main', { 'custnum' => $cust_num }) + or die 'unknown custnum' . $cust_num; + +my %phones_formatted = map { + $_ => format_phone_number($cust_phones->$_, $format) +} @$phone_types; + +sub format_phone_number { + my ($n, $f) = @_; + if ($f eq 'xxxxxxxxxx') { $n =~ s/-//g; } + return $n; +} + + \ No newline at end of file diff --git a/httemplate/elements/select.html b/httemplate/elements/select.html index 689566e36..100df94d0 100644 --- a/httemplate/elements/select.html +++ b/httemplate/elements/select.html @@ -69,7 +69,7 @@ % % } - + <% $opt{'post_field_label'} %> % } <%init> diff --git a/httemplate/elements/tr-select-cust_phone.html b/httemplate/elements/tr-select-cust_phone.html new file mode 100644 index 000000000..cf88392b0 --- /dev/null +++ b/httemplate/elements/tr-select-cust_phone.html @@ -0,0 +1,12 @@ + + <% $opt{'label'} || 'Customer Phones' %> + + <% include( '/elements/select-cust_phone.html', %opt ) %> + + + +<%init> + +my %opt = @_; + + diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html index 0ed5ef380..5083fcdcf 100644 --- a/httemplate/misc/email-customers.html +++ b/httemplate/misc/email-customers.html @@ -58,7 +58,7 @@ from/subject/body cgi params Preview notice <& /elements/progress-init.html, 'OneTrueForm', - [ qw( search table msgnum to_contact_classnum ) ], + [ qw( search table msgnum to_contact_classnum emailtovoice_contact custnum ) ], $process_url, $pdest, &> @@ -69,6 +69,8 @@ from/subject/body cgi params % # of the template, but should be sticky during draft editing + + % if ( !$msg_template->disabled ) { <& /elements/tr-td-label.html, 'label' => 'Template:' &> @@ -164,7 +166,11 @@ Template:
% } % # select destination contact classes -Send to contacts: + + + + + +
Send to contacts: +
<& /elements/checkboxes.html, 'style' => 'display: inline; vertical-align: top', 'disable_links' => 1, @@ -175,6 +181,24 @@ Send to contacts: $name eq 'invoice' #others default to unchecked }, &> +
+% if ($send_to_domain) { +
+ Email to voice +
+ +% } +

% # if sending a one-off message, show a form to edit it @@ -213,12 +237,25 @@ Send to contacts:
+ % } #end not action or alternate form + + <& /elements/footer.html &> <%init> @@ -227,12 +264,16 @@ my %opt = @_; $opt{'acl'} ||= 'Bulk send customer notices'; +my $email_to; + die "access denied" unless $FS::CurrentUser::CurrentUser->access_right($opt{'acl'}); my $conf = FS::Conf->new; my @no_search_fields = qw( table from subject html_body text_body popup url ); +my $send_to_domain = $conf->config('send-to-domain'); + my $form_action = $opt{'form_action'} || 'email-customers.html'; my $process_url = $opt{'process_url'} || 'process/email-customers.html'; my $title = $opt{'title'} || 'Send customer notices'; @@ -341,12 +382,14 @@ if ( !$cgi->param('preview') ) { # unless creating the msg_template failed, we now have one, so construct a # preview message from the first customer/whatever in the search results + my $cust; + if ( $msg_template ) { $sql_query->{'extra_sql'} .= ' LIMIT 1'; $sql_query->{'select'} = "$table.*"; $sql_query->{'order_by'} = ''; my $object = qsearchs($sql_query); - my $cust = $object->cust_main; + $cust = $object->cust_main; my %msgopts = ( 'cust_main' => $cust, 'object' => $object, @@ -367,14 +410,22 @@ if ( !$cgi->param('preview') ) { # contact_class_X params #we can't switch to multi_param until we're done supporting deb 7 local($CGI::LIST_CONTEXT_WARN) = 0; - foreach my $param ( $cgi->param ) { - if ( $param =~ /^contact_class_(\w+)$/ ) { - push @contact_classnum, $1; - if ( $1 eq 'invoice' ) { - push @contact_classname, 'Invoice recipients'; - } else { - my $contact_class = FS::contact_class->by_key($1); - push @contact_classname, encode_entities($contact_class->classname); + + if ($cgi->param('emailtovoice_contact')) { + $email_to = $cgi->param('emailtovoice_contact') . '@' . $send_to_domain; + push @contact_classnum, 'emailtovoice'; + push @contact_classname, $email_to; + } + else { + foreach my $param ( $cgi->param ) { + if ( $param =~ /^contact_class_(\w+)$/ ) { + push @contact_classnum, $1; + if ( $1 eq 'invoice' ) { + push @contact_classname, 'Invoice recipients'; + } else { + my $contact_class = FS::contact_class->by_key($1); + push @contact_classname, encode_entities($contact_class->classname); + } } } } @@ -383,10 +434,12 @@ if ( !$cgi->param('preview') ) { my @contact_checkboxes = ( [ 'invoice' => { label => 'Invoice recipients' } ] ); + foreach my $class (qsearch('contact_class', { disabled => '' })) { push @contact_checkboxes, [ $class->classnum, { label => $class->classname } ]; } + -- cgit v1.2.1