X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fsvc_pbx.pm;h=a5e181d9d321442349126cbe2bdcbdaf337e3e2e;hp=0eb544318cae495ff1844e0dfc31c4faa9e7aaec;hb=8f1500df332a86f1abe55a046778e42b21459430;hpb=696b790c88984203912b46c9e4b103c2925833c1 diff --git a/FS/FS/svc_pbx.pm b/FS/FS/svc_pbx.pm index 0eb544318..a5e181d9d 100644 --- a/FS/FS/svc_pbx.pm +++ b/FS/FS/svc_pbx.pm @@ -1,8 +1,10 @@ package FS::svc_pbx; +use base qw( FS::o2m_Common FS::device_Common FS::svc_External_Common ); use strict; -use base qw( FS::svc_External_Common ); +use Tie::IxHash; use FS::Record qw( qsearch qsearchs dbh ); +use FS::PagedSearch qw( psearch ); use FS::Conf; use FS::cust_svc; use FS::svc_phone; @@ -60,6 +62,11 @@ Maximum number of extensions Maximum number of simultaneous users +=item ip_addr + +The IP address of this PBX, if that's relevant. This must be a valid IP +address (or blank), but it's not checked for block assignment or uniqueness. + =back =head1 METHODS @@ -79,37 +86,26 @@ points to. You can ask the object for a copy with the I method. sub table { 'svc_pbx'; } sub table_info { + + tie my %fields, 'Tie::IxHash', + 'svcnum' => 'PBX', + 'id' => 'PBX/Tenant ID', + 'uuid' => 'External UUID', + 'title' => 'Name', + 'max_extensions' => 'Maximum number of User Extensions', + 'max_simultaneous' => 'Maximum number of simultaneous users', + 'ip_addr' => 'IP address', + ; + { '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, - 'fields' => { - 'id' => 'ID', - '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', -# }, - - }, + 'fields' => \%fields, }; } @@ -145,18 +141,6 @@ otherwise returns false. The additional fields pkgnum and svcpart (see L) should be defined. An FS::cust_svc record will be created and inserted. -=cut - -sub insert { - my $self = shift; - my $error; - - $error = $self->SUPER::insert; - return $error if $error; - - ''; -} - =item delete Delete this record from the database. @@ -210,18 +194,6 @@ sub delete { Replaces the OLD_RECORD with this one in the database. If there is an error, 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; -# -# ''; -#} - =item suspend Called by the suspend method of FS::cust_pkg (see L). @@ -248,9 +220,10 @@ sub check { my $x = $self->setfixed; return $x unless ref($x); my $part_svc = $x; - - - $self->SUPER::check; + + return + $self->ut_ipn('ip_addr') + || $self->SUPER::check; } sub _check_duplicate { @@ -276,11 +249,13 @@ sub _check_duplicate { return ''; } -=item get_cdrs +=item psearch_cdrs OPTIONS -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. +Returns a paged search (L) for Call Detail Records +associated with this service. By default, "associated with" means that +the "charged_party" field of the CDR matches the "title" field of the +service. To access the CDRs themselves, call "->fetch" on the resulting +object. =over 2 @@ -300,11 +275,21 @@ 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 by_ip_addr => 'src' or 'dst': Select CDRs where the src_ip_addr or +dst_ip_addr field matches title. In this case, some special logic is applied +to allow title to indicate a range of IP addresses. + +=item begin, end: Start and end of date range, as unix timestamp. + +=item cdrtypenum: Only return CDRs with this type. + +=item calltypenum: Only return CDRs with this call type. + =back =cut -sub get_cdrs { +sub psearch_cdrs { my($self, %options) = @_; my %hash = (); my @where = (); @@ -312,12 +297,23 @@ sub get_cdrs { my @fields = ( 'charged_party' ); $hash{'freesidestatus'} = $options{'status'} if exists($options{'status'}); - + + if ($options{'cdrtypenum'}) { + $hash{'cdrtypenum'} = $options{'cdrtypenum'}; + } + if ($options{'calltypenum'}) { + $hash{'calltypenum'} = $options{'calltypenum'}; + } + my $for_update = $options{'for_update'} ? 'FOR UPDATE' : ''; if ( $options{'by_svcnum'} ) { $hash{'svcnum'} = $self->svcnum; } + elsif ( $options{'by_ip_addr'} =~ /^src|dst$/) { + my $field = 'cdr.'.$options{'by_ip_addr'}.'_ip_addr'; + push @where, FS::cdr->ip_addr_sql($field, $self->title); + } else { #matching by title my $title = $self->title; @@ -344,15 +340,51 @@ sub get_cdrs { my $extra_sql = ( keys(%hash) ? ' AND ' : ' WHERE ' ). join(' AND ', @where ) if @where; - my @cdrs = - qsearch( { + psearch( { 'table' => 'cdr', 'hashref' => \%hash, 'extra_sql' => $extra_sql, 'order_by' => "ORDER BY startdate $for_update", - } ); + } ); +} + +=item get_cdrs (DEPRECATED) + +Like psearch_cdrs, but returns all the L objects at once, in a +single list. Arguments are the same as for psearch_cdrs. This can take +an unreasonably large amount of memory and is best avoided. + +=cut + +sub get_cdrs { + my $self = shift; + my $psearch = $self->psearch_cdrs($_); + qsearch ( $psearch->{query} ) +} + +=item sum_cdrs - @cdrs; +Takes the same options as psearch_cdrs, but returns a single row containing +"count" (the number of CDRs) and the sums of the following fields: duration, +billsec, rated_price, rated_seconds, rated_minutes. + +Note that if any calls are not rated, their rated_* fields will be null. +If you want to use those fields, pass the 'status' option to limit to +calls that have been rated. This is intentional; please don't "fix" it. + +=cut + +sub sum_cdrs { + my $self = shift; + my $psearch = $self->psearch_cdrs(@_); + $psearch->{query}->{'select'} = join(',', + 'COUNT(*) AS count', + map { "SUM($_) AS $_" } + qw(duration billsec rated_price rated_seconds rated_minutes) + ); + # hack + $psearch->{query}->{'extra_sql'} =~ s/ ORDER BY.*$//; + qsearchs ( $psearch->{query} ); } =back