From 2dca91166a0fe163a51741b37edc812c7a32b9a9 Mon Sep 17 00:00:00 2001 From: Christopher Burger Date: Tue, 22 Aug 2017 10:36:04 -0400 Subject: [PATCH] RT# 73964 - Changed global config send-to-domain to email-to-voice_domain --- FS/FS/Conf.pm | 2 +- FS/FS/cust_main_Mixin.pm | 2 +- FS/FS/part_event/Action/notice_to_emailtovoice.pm | 6 +++--- httemplate/misc/email-customers.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 02e65f5aa..bddeee932 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -898,7 +898,7 @@ my $validate_email = sub { $_[0] =~ }, { - 'key' => 'send-to-domain', + 'key' => 'email-to-voice_domain', 'section' => 'email_to_voice_services', 'description' => 'The Domain to send email to voice to', 'type' => 'text', diff --git a/FS/FS/cust_main_Mixin.pm b/FS/FS/cust_main_Mixin.pm index 5f9a3d6a2..1ef5387c1 100644 --- a/FS/FS/cust_main_Mixin.pm +++ b/FS/FS/cust_main_Mixin.pm @@ -398,7 +398,7 @@ sub email_search_result { my($class, $param) = @_; my $conf = FS::Conf->new; - my $send_to_domain = $conf->config('send-to-domain'); + my $send_to_domain = $conf->config('email-to-voice_domain'); my $msgnum = $param->{msgnum}; my $from = delete $param->{from}; diff --git a/FS/FS/part_event/Action/notice_to_emailtovoice.pm b/FS/FS/part_event/Action/notice_to_emailtovoice.pm index ae766e81b..a3a5e9824 100644 --- a/FS/FS/part_event/Action/notice_to_emailtovoice.pm +++ b/FS/FS/part_event/Action/notice_to_emailtovoice.pm @@ -23,7 +23,7 @@ sub eventtable_hashref { sub option_fields { #my $conf = new FS::Conf; - #my $to_domain = $conf->config('send-to-domain'); + #my $to_domain = $conf->config('email-to-voice_domain'); ( 'to_name' => { 'label' => 'Address To', @@ -33,7 +33,7 @@ sub option_fields { 'fax' => 'Fax #', 'daytime' => 'Day Time #', }, - 'post_field_label' => "@" , #. $to_domain , + 'post_field_label' => "@", # . $to_domain , }, 'msgnum' => { 'label' => 'Template', @@ -53,7 +53,7 @@ sub do_action { my( $self, $object ) = @_; my $conf = new FS::Conf; - my $to_domain = $conf->config('send-to-domain') + my $to_domain = $conf->config('email-to-voice_domain') or die "Can't send notice with out send-to-domain, being set in global config \n"; my $cust_main = $self->cust_main($object); diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html index 5083fcdcf..fe637abe1 100644 --- a/httemplate/misc/email-customers.html +++ b/httemplate/misc/email-customers.html @@ -272,7 +272,7 @@ die "access denied" 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 $send_to_domain = $conf->config('email-to-voice_domain'); my $form_action = $opt{'form_action'} || 'email-customers.html'; my $process_url = $opt{'process_url'} || 'process/email-customers.html'; -- 2.11.0