X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fcdr.html;h=e57913e5f8f24126659eb9c78d3fa05963ff862b;hp=642c2da5b366366fb14790c2c8d822d229df043f;hb=f30eaaf66cd0a947f388a03edd4522ba92a367bb;hpb=e55892bdf6dc95710a19876087690a9664421215 diff --git a/httemplate/search/cdr.html b/httemplate/search/cdr.html index 642c2da5b..e57913e5f 100644 --- a/httemplate/search/cdr.html +++ b/httemplate/search/cdr.html @@ -9,26 +9,7 @@ 'fields' => \@fields, 'links' => \@links, 'html_form' => qq!
!, - #false laziness w/queue.html - 'html_foot' => sub { - if ( $areboxes ) { - '
'. - ''. - qq!
!. - qq!
!. - ''; - } else { - ''; - } - }, - + 'html_foot' => $html_foot, &> <%init> @@ -44,8 +25,6 @@ my $totalminutes_sub = sub { my $conf = new FS::Conf; -my $areboxes = 0; - my $title = 'Call Detail Records'; my $hashref = {}; @@ -279,6 +258,23 @@ if ( $cgi->param('acctid') =~ /\d/ ) { } ### +# accountcode +### + +if ( $cgi->param('accountcode') =~ /\S/ ) { + my $accountcode = $cgi->param('accountcode'); + my @accountcode = map { + ( my $v = $_ ) =~ s/^\s+|\s+$//g; # trim margin whitespace + length $v ? dbh->quote($v) : () + } grep /\S/, split /\R/, $accountcode; # collect non-trivial lines + if (@accountcode) { + my $search = 'accountcode IN ( ' . join( ',', @accountcode ) . ' )'; + push @qsearch, $search; + push @search, $search; + } +} + +### # finish it up ### @@ -293,11 +289,11 @@ my $qsearch = join(' AND ', @qsearch); $qsearch = ( scalar(keys %$hashref) ? ' AND ' : ' WHERE ' ) . $qsearch if $qsearch; -my $query = { 'table' => 'cdr', - 'hashref' => $hashref, - 'extra_sql' => $qsearch, - 'order_by' => 'ORDER BY calldate', - }; +my $query = { 'table' => 'cdr', + 'hashref' => $hashref, + 'extra_sql' => $qsearch, + 'order_by' => 'ORDER BY calldate', + }; if ( $cgi->param('longest') =~ /^(\d+)$/ && $cgi->param('longest') > 0 ) { $cgi->param('maxrecords',$1); @@ -312,16 +308,26 @@ if ( $cgi->param('longest') =~ /^(\d+)$/ && $cgi->param('longest') > 0 ) { ### my %header = %{ FS::cdr->table_info->{'fields'} }; +$header{ratename} = 'Rate plan'; my @first = qw( acctid calldate clid charged_party src dst dcontext ); my %first = map { $_=>1 } @first; -my @fields = ( @first, grep !$first{$_}, fields('cdr') ); +my @fields = ( @first, + grep !$first{$_}, ( fields('cdr'), 'ratename' ) + ); if ( $cgi->param('show') ) { @fields = grep $cgi->param("show_$_"), @fields; } +if ( grep { $_ eq 'ratename' } @fields ) { + $query->{addl_from} .= ' + LEFT JOIN rate_detail ON (cdr.rated_ratedetailnum = rate_detail.ratedetailnum) + LEFT JOIN rate ON (rate_detail.ratenum = rate.ratenum) + '; +} + my @header = map { if ( exists($header{$_}) ) { $header{$_}; @@ -355,7 +361,6 @@ my %links = ( @fields = map { exists($fields{$_}) ? $fields{$_} : $_ } @fields; unshift @fields, sub { return '' unless $edit_data; - $areboxes = 1; my $cdr = shift; my $acctid = $cdr->acctid; qq!!; @@ -409,4 +414,14 @@ if ( $topmode ) { $nototalminutes = 1; } +my $html_foot = include('/search/elements/checkbox-foot.html', + actions => [ + { submit => "reprocess selected", + name => "action", + confirm => "Are you sure you want to reprocess the selected CDRs?" }, + { submit => "delete selected", + name => "action", + confirm => "Are you sure you want to delete the selected CDRs?" }, + ] +);