X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2Fsvc_pbx.pm;h=6ae04189c8488983ae8fcc4eaa831fc807d7607c;hb=7b125e587a4d1ee0aca692e23ea7897f671855ae;hp=7c4385cde7c9a9bf50c230c8a5882a52f4bd036d;hpb=8d40a4a4e914bd2003dd6443c2056d57d0aaaeff;p=freeside.git diff --git a/FS/FS/svc_pbx.pm b/FS/FS/svc_pbx.pm index 7c4385cde..6ae04189c 100644 --- a/FS/FS/svc_pbx.pm +++ b/FS/FS/svc_pbx.pm @@ -55,10 +55,6 @@ PBX name Maximum number of extensions -=item max_simultaneous - -Maximum number of simultaneous users - =back =head1 METHODS @@ -89,7 +85,6 @@ sub table_info { 'id' => 'ID', 'title' => 'Name', 'max_extensions' => 'Maximum number of User Extensions', - 'max_simultaneous' => 'Maximum number of simultaneous users', # 'field' => 'Description', # 'another_field' => { # 'label' => 'Description', @@ -211,15 +206,15 @@ returns the error, otherwise returns false. =cut -#sub replace { -# my ( $new, $old ) = ( shift, shift ); -# my $error; -# -# $error = $new->SUPER::replace($old); -# return $error if $error; -# -# ''; -#} +sub replace { + my ( $new, $old ) = ( shift, shift ); + my $error; + + $error = $new->SUPER::replace($old); + return $error if $error; + + ''; +} =item suspend @@ -267,75 +262,6 @@ sub _check_duplicate { } } -=item get_cdrs - -Returns a set of Call Detail Records (see L) associated with this -service. By default, "associated with" means that the "charged_party" field of -the CDR matches the "title" field of the service. - -=over 2 - -Accepts the following options: - -=item for_update => 1: SELECT the CDRs "FOR UPDATE". - -=item status => "" (or "done"): Return only CDRs with that processing status. - -=item inbound => 1: No-op for svc_pbx CDR processing. - -=item default_prefix => "XXX": Also accept the phone number of the service prepended -with the chosen prefix. - -=item disable_src => 1: No-op for svc_pbx CDR processing. - -=back - -=cut - -sub get_cdrs { - my($self, %options) = @_; - my %hash = (); - my @where = (); - - my @fields = ( 'charged_party' ); - $hash{'freesidestatus'} = $options{'status'} - if exists($options{'status'}); - - my $for_update = $options{'for_update'} ? 'FOR UPDATE' : ''; - - my $title = $self->title; - - my $prefix = $options{'default_prefix'}; - - my @orwhere = map " $_ = '$title' ", @fields; - push @orwhere, map " $_ = '$prefix$title' ", @fields - if length($prefix); - if ( $prefix =~ /^\+(\d+)$/ ) { - push @orwhere, map " $_ = '$1$title' ", @fields - } - - push @where, ' ( '. join(' OR ', @orwhere ). ' ) '; - - if ( $options{'begin'} ) { - push @where, 'startdate >= '. $options{'begin'}; - } - if ( $options{'end'} ) { - push @where, 'startdate < '. $options{'end'}; - } - - my $extra_sql = ( keys(%hash) ? ' AND ' : ' WHERE ' ). join(' AND ', @where ); - - my @cdrs = - qsearch( { - 'table' => 'cdr', - 'hashref' => \%hash, - 'extra_sql' => $extra_sql, - 'order_by' => "ORDER BY startdate $for_update", - } ); - - @cdrs; -} - =back =head1 BUGS