[freeside-commits] branch master updated. 1878ee1e6238755464472ea20e944fdab8fb5f0b

Ivan ivan at 420.am
Wed Jun 29 10:15:18 PDT 2016


The branch, master has been updated
       via  1878ee1e6238755464472ea20e944fdab8fb5f0b (commit)
      from  4ce5e00fd7221feafc994694bac889dcc12323df (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1878ee1e6238755464472ea20e944fdab8fb5f0b
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jun 29 10:15:17 2016 -0700

    deprecate welcome_msgnum / svc_acct_welcome_exclude, RT#71525

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index bc2d48f..a2475c9 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 b7967ae..b659b01 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;

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm     |    4 ++--
 FS/FS/svc_acct.pm |   12 ------------
 2 files changed, 2 insertions(+), 14 deletions(-)




More information about the freeside-commits mailing list