fix search of pending/billed CDRs to find src field too, RT#9640

2 files changed, 28 insertions, 6 deletions

diff --git a/httemplate/search/cdr.html b/httemplate/search/cdr.html
index a5575967c..00aee9e47 100644
--- a/httemplate/search/cdr.html
+++ b/httemplate/search/cdr.html
@@ -172,13 +172,26 @@ if ( $cgi->param('charged_party') =~ /^\s*([\d\-\+\ ]+)\s*$/ ) {
   #push @search, "charged_party = '$charged_party'";
   #XXX countrycode
 
-  my $search = " (    charged_party = '$charged_party'
-                   OR charged_party = '1$charged_party' ) ";
+  my $search = " (    charged_party IN ('$charged_party', '1$charged_party') )";
 
   push @search,  $search;
   push @qsearch, $search;
 }
 
+if ( $cgi->param('charged_party_or_src') =~ /^\s*([\d\-\+\ ]+)\s*$/ ) {
+  ( my $charged_party = $1 ) =~ s/\D//g;
+  #$hashref->{'charged_party'} = $charged_party;
+  #push @search, "charged_party = '$charged_party'";
+  #XXX countrycode
+
+  my $search = " (    charged_party IN ('$charged_party', '1$charged_party')
+                   OR src           IN ('$charged_party', '1$charged_party') )";
+
+  push @search,  $search;
+  push @qsearch, $search;
+}
+
+
 ###
 # cdrbatchnum (or legacy cdrbatch)
 ###
diff --git a/httemplate/view/svc_phone.cgi b/httemplate/view/svc_phone.cgi
index 75591c747..3424d34f3 100644
--- a/httemplate/view/svc_phone.cgi
+++ b/httemplate/view/svc_phone.cgi
@@ -120,19 +120,28 @@ my $html_foot = sub {
     'billed'  => 'done',
   ;
 
-  #XXX src & charged party (& default prefix) as per voip_cdr.pm
-  #XXX handle toll free too
-
   my $number = $svc_phone->phonenum;
   $number = $svc_phone->countrycode. $number
     unless $svc_phone->countrycode eq '1';
 
+  #src & charged party as per voip_cdr.pm
+  my $search;
+  my $cust_pkg = $svc_phone->cust_svc->cust_pkg;
+  if ( $cust_pkg && $cust_pkg->part_pkg->option('disable_src') ) {
+    $search = "charged_party_or_src=$number";
+  } else {
+    $search = "src=$number";
+  }
+
+  #XXX default prefix as per voip_cdr.pm
+  #XXX handle toll free too
+
   #my @links = map {
   #  qq(<A HREF="${p}search/cdr.html?src=$number;freesidestatus=$what{$_}">).
   #  "View $_ CDRs</A>";
   #} keys(%what);
   my @links = map {
-    qq(<A HREF="${p}search/cdr.html?cdrbatchnum=__ALL__;charged_party=$number;freesidestatus=$what{$_}">).
+    qq(<A HREF="${p}search/cdr.html?cdrbatchnum=__ALL__;$search;freesidestatus=$what{$_}">).
     "View $_ CDRs</A>";
   } keys(%what);