fix 'Can't call method "setup" on an undefined value' error when using into rates...

[freeside.git] / FS / FS / svc_pbx.pm

diff --git a/FS/FS/svc_pbx.pm b/FS/FS/svc_pbx.pm
index adc45a7..37ab174 100644 (file)
--- a/FS/FS/svc_pbx.pm
+++ b/FS/FS/svc_pbx.pm
@@ -81,8 +81,9 @@ sub table { 'svc_pbx'; }
 sub table_info {
   {
     'name' => 'PBX',
-    'name_plural' => 'PBXs', #optional,
-    'longname_plural' => 'PBXs', #optional
+    'name_plural' => 'PBXs',
+    'lcname_plural' => 'PBXs',
+    'longname_plural' => 'PBXs',
     'sorts' => 'svcnum', # optional sort field (or arrayref of sort fields, main first)
     'display_weight' => 70,
     'cancel_weight'  => 90,
@@ -91,24 +92,6 @@ sub table_info {
       'title' => 'Name',
       'max_extensions' => 'Maximum number of User Extensions',
       'max_simultaneous' => 'Maximum number of simultaneous users',
-#      'field'         => 'Description',
-#      'another_field' => { 
-#                           'label'     => 'Description',
-#                         'def_label' => 'Description for service definitions',
-#                         'type'      => 'text',
-#                         'disable_default'   => 1, #disable switches
-#                         'disable_fixed'     => 1, #
-#                         'disable_inventory' => 1, #
-#                       },
-#      'foreign_key'   => { 
-#                           'label'        => 'Description',
-#                         'def_label'    => 'Description for service defs',
-#                         'type'         => 'select',
-#                         'select_table' => 'foreign_table',
-#                         'select_key'   => 'key_field_in_table',
-#                         'select_label' => 'label_field_in_table',
-#                       },
-
     },
   };
 }
@@ -253,22 +236,27 @@ sub check {
   $self->SUPER::check;
 }
 
-#XXX this is a way-too simplistic implementation
-# at the very least, title should be unique across exports that need that or
-# controlled by a conf setting or something
 sub _check_duplicate {
   my $self = shift;
 
   my $conf = new FS::Conf;
-  return '' if $conf->config('global_unique-pbx_title') eq 'disabled';
-
+  
   $self->lock_table;
 
-  if ( qsearchs( 'svc_pbx', { 'title' => $self->title } ) ) {
-    return "Name in use";
-  } else {
-    return '';
+  foreach my $field ('title', 'id') {
+    my $global_unique = $conf->config("global_unique-pbx_$field");
+    # can be 'disabled', 'enabled', or empty.
+    # if empty, check per exports; if not empty or disabled, check 
+    # globally.
+    next if $global_unique eq 'disabled';
+    my @dup = $self->find_duplicates(
+      ($global_unique ? 'global' : 'export') , $field
+    );
+    next if !@dup;
+    return "duplicate $field '".$self->getfield($field).
+           "': conflicts with svcnum ".$dup[0]->svcnum;
   }
+  return '';
 }
 
 =item get_cdrs
@@ -295,6 +283,10 @@ with the chosen prefix.
 =item by_svcnum => 1: Select CDRs where the svcnum field matches, instead of 
 title/charged_party.  Normally this field is set after processing.
 
+=item begin, end: Start and end of date range, as unix timestamp.
+
+=item cdrtypenum: Only return CDRs with this type number.
+
 =back
 
 =cut
@@ -307,7 +299,11 @@ sub get_cdrs {
   my @fields = ( 'charged_party' );
   $hash{'freesidestatus'} = $options{'status'}
     if exists($options{'status'});
-  
+
+  if ($options{'cdrtypenum'}) {
+    $hash{'cdrtypenum'} = $options{'cdrtypenum'};
+  }
+
   my $for_update = $options{'for_update'} ? 'FOR UPDATE' : '';
 
   if ( $options{'by_svcnum'} ) {