X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcdr.html;h=bf59ff625bcac6eb831001ca86db49c527fb7676;hb=636dd1f25af52d35efe7a323a5765ff5adeadf83;hp=5544ff58cf90856d91783b3cbdcf66ab214e5738;hpb=140b381af1008dad929b4d3b87aa1e54747d534f;p=freeside.git diff --git a/httemplate/search/cdr.html b/httemplate/search/cdr.html index 5544ff58c..bf59ff625 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,10 +168,15 @@ 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*$/ ) { @@ -257,7 +267,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