[freeside-commits] freeside/FS/FS Conf.pm, 1.397.2.36, 1.397.2.37 svc_acct.pm, 1.304.2.5, 1.304.2.6

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv11953/FS/FS

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	Conf.pm svc_acct.pm 
Log Message:
add option to exclude configurable svc_acct svcparts from welcome emails, RT11021

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.397.2.36
retrieving revision 1.397.2.37
diff -u -w -d -r1.397.2.36 -r1.397.2.37
--- Conf.pm	29 Mar 2011 00:32:21 -0000	1.397.2.36
+++ Conf.pm	8 Apr 2011 04:59:00 -0000	1.397.2.37
@@ -2050,6 +2050,14 @@
   },
 
   {
+    'key'         => 'svc_acct_welcome_exclude',
+    'section'     => 'notification',
+    'description' => 'A list of svc_acct services for which no welcome email is to be sent.',
+    'type'        => 'select-part_svc',
+    'multiple'    => 1,
+  },
+
+  {
     'key'         => 'welcome_email',
     'section'     => 'deprecated',
     'description' => 'Template file for welcome email.  Welcome emails are sent to the customer email invoice destination(s) each time a svc_acct record is created.',

Index: svc_acct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_acct.pm,v
retrieving revision 1.304.2.5
retrieving revision 1.304.2.6
diff -u -w -d -r1.304.2.5 -r1.304.2.6
--- svc_acct.pm	1 Feb 2011 11:14:08 -0000	1.304.2.5
+++ svc_acct.pm	8 Apr 2011 04:59:01 -0000	1.304.2.6
@@ -746,6 +746,8 @@
     }
 
     #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 ) {
@@ -829,6 +831,7 @@
 
       } # if $welcome_template
     } # if !$msgnum
+    }
   } # if $cust_pkg
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;