X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fsvc_pbx.pm;h=a5e181d9d321442349126cbe2bdcbdaf337e3e2e;hp=66e51da71ddeb0e95c837af988819706eb563db8;hb=8f1500df332a86f1abe55a046778e42b21459430;hpb=f6d64a9f735b666e876cf1a42e5ca16169ba7870

diff --git a/FS/FS/svc_pbx.pm b/FS/FS/svc_pbx.pm
index 66e51da71..a5e181d9d 100644
--- a/FS/FS/svc_pbx.pm
+++ b/FS/FS/svc_pbx.pm
@@ -1,7 +1,8 @@
 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;
@@ -61,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
@@ -80,6 +86,17 @@ points to.  You can ask the object for a copy with the I<hash> 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',
@@ -88,12 +105,7 @@ sub table_info {
     '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',
-    },
+    'fields' => \%fields,
   };
 }
 
@@ -129,18 +141,6 @@ otherwise returns false.
 The additional fields pkgnum and svcpart (see L<FS::cust_svc>) 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.
@@ -194,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<FS::cust_pkg>).
@@ -232,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 {
@@ -373,6 +362,31 @@ sub get_cdrs {
   qsearch ( $psearch->{query} )
 }
 
+=item sum_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
 
 =head1 BUGS