X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_pbx.pm;h=1989622604100adf75407e325e030d581e2c7fc5;hb=7ad052da94c4d205cf426c0ef3ef113f5429b948;hp=f39234d8bb1816d1d0dc581f32efb3a637faddf2;hpb=ed11b2721dee39239a82468ff0924943fa577027;p=freeside.git

diff --git a/FS/FS/svc_pbx.pm b/FS/FS/svc_pbx.pm
index f39234d8b..198962260 100644
--- a/FS/FS/svc_pbx.pm
+++ b/FS/FS/svc_pbx.pm
@@ -63,6 +63,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
@@ -86,9 +91,11 @@ 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',
   ;
 
   {
@@ -238,9 +245,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 {
@@ -379,6 +387,34 @@ 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} );
+}
+
+
+# 3.x stub
+
 sub pbx_extension {
   my $self = shift;
   qsearch('pbx_extension', { svcnum=>$self->svcnum });