diff options
author | Ivan Kohler <ivan@freeside.biz> | 2016-06-29 10:15:17 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2016-06-29 10:15:17 -0700 |
commit | 1878ee1e6238755464472ea20e944fdab8fb5f0b (patch) | |
tree | 82c0b561a26b1a9f5e82994b81a8bfe86ac0e95a | |
parent | 4ce5e00fd7221feafc994694bac889dcc12323df (diff) |
deprecate welcome_msgnum / svc_acct_welcome_exclude, RT#71525
-rw-r--r-- | FS/FS/Conf.pm | 4 | ||||
-rw-r--r-- | FS/FS/svc_acct.pm | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index bc2d48f63..a2475c9f0 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -2498,14 +2498,14 @@ and customer address. Include units.', { 'key' => 'welcome_msgnum', 'section' => 'notification', - 'description' => 'Template to use for welcome messages when a svc_acct record is created.', + 'description' => 'Deprecated; use a billing event instead. Used to be the template to use for welcome messages when a svc_acct record is created.', %msg_template_options, }, { 'key' => 'svc_acct_welcome_exclude', 'section' => 'notification', - 'description' => 'A list of svc_acct services for which no welcome email is to be sent.', + 'description' => 'Deprecated; use a billing event instead. A list of svc_acct services for which no welcome email is to be sent.', 'type' => 'select-part_svc', 'multiple' => 1, }, diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm index b7967ae36..b659b01b2 100644 --- a/FS/FS/svc_acct.pm +++ b/FS/FS/svc_acct.pm @@ -750,18 +750,6 @@ sub insert { } } - #welcome email - my @welcome_exclude_svcparts = $conf->config('svc_acct_welcome_exclude'); - unless ( grep { $_ eq $self->svcpart } @welcome_exclude_svcparts ) { - my $error = ''; - my $msgnum = $conf->config('welcome_msgnum', $agentnum); - if ( $msgnum ) { - my $msg_template = qsearchs('msg_template', { msgnum => $msgnum }); - $error = $msg_template->send('cust_main' => $cust_main, - 'object' => $self); - #should this do something on error? - } - } } # if $cust_pkg $dbh->commit or die $dbh->errstr if $oldAutoCommit; |