[freeside-commits] freeside/FS/FS Conf.pm, 1.507, 1.508 cust_main.pm, 1.607, 1.608 svc_acct.pm, 1.325, 1.326

[Mark Wells]

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

Modified Files:
	Conf.pm cust_main.pm svc_acct.pm 
Log Message:
more per-agent options, #15973

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -w -d -r1.507 -r1.508
--- Conf.pm	10 Feb 2012 20:57:53 -0000	1.507
+++ Conf.pm	19 Feb 2012 02:30:15 -0000	1.508
@@ -1786,6 +1786,7 @@
     'section'     => 'username',
     'description' => 'Allow uppercase characters in usernames.  Not recommended for use with FreeRADIUS with MySQL backend, which is case-insensitive by default.',
     'type'        => 'checkbox',
+    'per_agent'   => 1,
   },
 
   { 
@@ -3589,6 +3590,7 @@
     'section'     => '',
     'description' => 'Require daytime or night phone for all customer records.',
     'type'        => 'checkbox',
+    'per_agent'   => 1,
   },
 
   {
@@ -3596,6 +3598,7 @@
     'section'     => '',
     'description' => 'Email address field is required: require at least one invoicing email address for all customer records.',
     'type'        => 'checkbox',
+    'per_agent'   => 1,
   },
 
   {

Index: svc_acct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_acct.pm,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -w -d -r1.325 -r1.326
--- svc_acct.pm	18 Jan 2012 02:48:02 -0000	1.325
+++ svc_acct.pm	19 Feb 2012 02:30:16 -0000	1.326
@@ -1163,6 +1163,7 @@
 
   my $cust_pkg;
   local $username_letter = $username_letter;
+  local $username_uppercase = $username_uppercase;
   if ($self->svcnum) {
     my $cust_svc = $self->cust_svc
       or return "no cust_svc record found for svcnum ". $self->svcnum;
@@ -1174,6 +1175,8 @@
   if ($cust_pkg) {
     $username_letter =
       $conf->exists('username-letter', $cust_pkg->cust_main->agentnum);
+    $username_uppercase =
+      $conf->exists('username-uppercase', $cust_pkg->cust_main->agentnum);
   }
 
   my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.607
retrieving revision 1.608
diff -u -w -d -r1.607 -r1.608
--- cust_main.pm	13 Feb 2012 22:09:24 -0000	1.607
+++ cust_main.pm	19 Feb 2012 02:30:16 -0000	1.608
@@ -1847,7 +1847,7 @@
     return $error if $error;
   }
 
-  if ( $conf->exists('cust_main-require_phone')
+  if ( $conf->exists('cust_main-require_phone', $self->agentnum)
        && ! length($self->daytime) && ! length($self->night) && ! length($self->mobile)
      ) {
 
@@ -3214,7 +3214,7 @@
   }
 
   return "Email address required"
-    if $conf->exists('cust_main-require_invoicing_list_email')
+    if $conf->exists('cust_main-require_invoicing_list_email', $self->agentnum)
     && ! grep { $_ !~ /^([A-Z]+)$/ } @$arrayref;
 
   '';