From c883d44a1e9a48505ba2427cf17d39595c38092c 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. Conflicts: FS/FS/cust_main_Mixin.pm httemplate/config/config-view.cgi httemplate/misc/email-customers.html --- httemplate/config/config-view.cgi | 5 ++- 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 | 53 +++++++++++++++++++++++++-- 5 files changed, 97 insertions(+), 6 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 7b2e55a55..7a6191171 100644 --- a/httemplate/config/config-view.cgi +++ b/httemplate/config/config-view.cgi @@ -420,8 +420,9 @@ my @deleteable = qw( invoice_latexreturnaddress invoice_htmlreturnaddress ); my %deleteable = map { $_ => 1 } @deleteable; my @sections = (qw( - required billing invoicing notification UI API self-service ticketing - network_monitoring username password session shell BIND telephony + required billing invoicing notification email_to_voice_services UI + API self-service ticketing network_monitoring username password + session shell BIND telephony ), '', 'deprecated' ); 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 59010c140..9dd4aec2c 100644 --- a/httemplate/elements/select.html +++ b/httemplate/elements/select.html @@ -41,7 +41,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 b8ba99705..6e37d74fc 100644 --- a/httemplate/misc/email-customers.html +++ b/httemplate/misc/email-customers.html @@ -46,6 +46,8 @@ should be used to set msgnum or from/subject/html_body cgi params + + % if ( $cgi->param('action') eq 'send' ) { @@ -55,13 +57,12 @@ should be used to set msgnum or from/subject/html_body cgi params <& /elements/progress-init.html, 'OneTrueForm', [ qw( search table from subject html_body text_body - msgnum to_contact_classnum ) ], + msgnum to_contact_classnum emailtovoice_contact custnum ) ], $process_url, $pdest, &> % } elsif ( $cgi->param('action') eq 'preview' ) { - Preview notice @@ -151,7 +152,11 @@ Template: &>
% # select destination contact classes -Send to contacts: + + + + + +
Send to contacts: +
<& /elements/checkboxes.html, 'style' => 'display: inline; vertical-align: top', 'disable_links' => 1, @@ -162,6 +167,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 @@ -199,6 +222,7 @@ Send to contacts: %#Substitution vars: + % } #end not action or alternate form @@ -211,6 +235,18 @@ Send to contacts: % } + + <& /elements/footer.html &> <%init> @@ -219,12 +255,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( action 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'; @@ -310,6 +350,11 @@ if ( $cgi->param('action') eq 'preview' ) { # contact_class_X params in preview foreach my $param ( $cgi->param ) { + if ($cgi->param('emailtovoice_contact')) { + $email_to = $cgi->param('emailtovoice_contact') . '@' . $send_to_domain; + push @contact_classnum, 'emailtovoice'; + push @contact_classname, $email_to; + } if ( $param =~ /^contact_class_(\w+)$/ ) { push @contact_classnum, $1; if ( $1 eq 'invoice' ) { @@ -327,10 +372,12 @@ if ( $cgi->param('action') eq '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