X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcdr.html;h=7e62447147c7d468d8bb0ad8c3ba2e481230f352;hb=e168ca3db2702bd9a540316cd9bd840238dd19ce;hp=5544ff58cf90856d91783b3cbdcf66ab214e5738;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git

diff --git a/httemplate/search/cdr.html b/httemplate/search/cdr.html
index 5544ff58c..7e6244714 100644
--- a/httemplate/search/cdr.html
+++ b/httemplate/search/cdr.html
@@ -8,6 +8,7 @@
 			    'order_by'  => 'ORDER BY calldate',
                           },
                'count_query' => $count_query,
+               'count_addl' => [ $totalminutes_sub ],
                'header' => [
                              '', # checkbox column
                              @header,
@@ -45,7 +46,6 @@
                                   '';
                                 }
                               },
-
              )
 %>
 <%init>
@@ -55,6 +55,11 @@ die "access denied"
 
 my $edit_data = $FS::CurrentUser::CurrentUser->access_right('Edit rating data');
 
+my $totalminutes_sub = sub {
+    my $billsec = shift;
+    sprintf("%.2f",$billsec/60) . ' total minutes';
+};
+
 my $conf = new FS::Conf;
 
 my $areboxes = 0;
@@ -163,16 +168,21 @@ if ( $cgi->param('src') =~ $phonenum ) {
   push @search, "src = '$src'";
 }
 
-if ( $cgi->param('dst') =~ $phonenum ) {
-  ( my $dst = $1 ) =~ s/$x//g;
-  $hashref->{'dst'} = $dst;
-  push @search, "dst = '$dst'";
+if ( $cgi->param('dst') ) {
+
+  my @d = map { $_, "1$_" } split(/\s*,\s*/, $cgi->param('dst') );
+  
+  my $search = 'dst IN ('. join(',', map dbh->quote($_), @d). ')';
+
+  push @search,  $search;
+  push @qsearch, $search;
+
 }
 
 if ( $cgi->param('dcontext') =~ /^\s*(.+)\s*$/ ) {
   my $dcontext = $1;
   $hashref->{'dcontext'} = $dcontext;
-  push @search, "dcontext = '$dcontext'";
+  push @search, 'dcontext = '. dbh->quote($dcontext);
 }
 
 if ( $cgi->param('charged_party') ) {
@@ -198,6 +208,12 @@ if ( $cgi->param('charged_party_or_src') ) {
   push @qsearch, $search;
 }
 
+if ( $cgi->param('lastapp') =~ /^\s*(.+)\s*$/ ) {
+  my $lastapp = $1;
+  $hashref->{'lastapp'} = $lastapp;
+  push @search, 'lastapp = '. dbh->quote($lastapp);
+}
+
 if ( $cgi->param('svcnum') =~ /^([\d, ]+)$/ ) {
   my $svcnum = $1;
   my $search = "svcnum IN ($svcnum)";
@@ -257,7 +273,7 @@ if ( $cgi->param('acctid') =~ /\d/ ) {
 my $search = join(' AND ', @search);
 $search = "WHERE $search" if $search;
 
-my $count_query = "SELECT COUNT(*) FROM cdr $search";
+my $count_query = "SELECT COUNT(*), sum(billsec) FROM cdr $search";
 
 my $qsearch = join(' AND ', @qsearch);
 $qsearch = ( scalar(keys %$hashref) ? ' AND ' : ' WHERE ' ) . $qsearch