X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcdr.html;h=4bac8c1f9d35f5a6fdd712f7499e938fa5cbeaf4;hb=1203e278e2ec38fcf1468da2e4f10862004bebeb;hp=61d41f8d0c2042d2e0456330d7c9abd6fbd87947;hpb=4688c4a55a51c4ce2100c1c98e7e650eb77ac95d;p=freeside.git

diff --git a/httemplate/search/cdr.html b/httemplate/search/cdr.html
index 61d41f8d0..4bac8c1f9 100644
--- a/httemplate/search/cdr.html
+++ b/httemplate/search/cdr.html
@@ -24,7 +24,6 @@ my $hashref = {};
 # and fixup $count_query
 
 my @search = ();
-my @qsearch = ();
 
 ###
 # freesidestatus
@@ -48,19 +47,25 @@ if ( $cgi->param('freesidestatus') eq 'NULL' ) {
 # dates
 ###
 
+my $str2time_sql = str2time_sql;
+
 my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-push @search,
-my @dsearch = ( "extract(epoch from calldate) >= $beginning ",
-                "extract(epoch from calldate) <= $ending"
-	      );
-push @search, @dsearch;
-push @qsearch, @search;
+push @search, "$str2time_sql calldate) >= $beginning ",
+              "$str2time_sql calldate) <= $ending";
+
+###
+# duration / billsec
+###
 
+push @search, FS::UI::Web::parse_lt_gt($cgi, 'duration');
+push @search, FS::UI::Web::parse_lt_gt($cgi, 'billsec');
 
 ###
-# src/dest
+# src/dest/charged_party
 ###
 
+my @qsearch = @search;
+
 if ( $cgi->param('src') =~ /^\s*([\d\-\+\ ]+)\s*$/ ) {
   ( my $src = $1 ) =~ s/\D//g;
   $hashref->{'src'} = $src;
@@ -73,6 +78,18 @@ if ( $cgi->param('dst') =~ /^\s*([\d\-\+ ]+)\s*$/ ) {
   push @search, "dst = '$dst'";
 }
 
+if ( $cgi->param('charged_party') =~ /^\s*([\d\-\+\ ]+)\s*$/ ) {
+  ( my $charged_party = $1 ) =~ s/\D//g;
+  #$hashref->{'charged_party'} = $charged_party;
+  #push @search, "charged_party = '$charged_party'";
+  #XXX countrycode
+  push @search,  " (    charged_party = '$charged_party'
+                     OR charged_party = '1$charged_party' ) ";
+  push @qsearch, " (    charged_party = '$charged_party'
+                    OR charged_party = '1$charged_party' ) ";
+}
+
+
 ###
 # finish it up
 ###