DNS, RT#8933

[freeside.git] / httemplate / view / svc_phone.cgi

diff --git a/httemplate/view/svc_phone.cgi b/httemplate/view/svc_phone.cgi
index ebde422..27d270c 100644 (file)
--- a/httemplate/view/svc_phone.cgi
+++ b/httemplate/view/svc_phone.cgi
@@ -29,18 +29,16 @@ my $html_foot = sub {
   # E911 Info
   ###
 
-  my $loc = $svc_phone->cust_location_or_main;
-
   my $e911 = 
     'E911 Information'.
     &ntable("#cccccc"). '<TR><TD>'. ntable("#cccccc",2).
       '<TR><TD>Location</TD>'.
       '<TD BGCOLOR="#FFFFFF">'.
-        $loc->location_label( 'join_string'     => '<BR>',
-                              'double_space'    => ' &nbsp; ',
-                              'escape_function' => \&encode_entities,
-                              'countrydefault'  => $countrydefault,
-                            ).
+        $svc_phone->location_label( 'join_string'     => '<BR>',
+                                    'double_space'    => ' &nbsp; ',
+                                    'escape_function' => \&encode_entities,
+                                    'countrydefault'  => $countrydefault,
+                                  ).
       '</TD></TR>'.
     '</TABLE></TD></TR></TABLE>'.
     '<BR>'
@@ -122,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=$number";
+  } else {
+    $search = "charged_party_or_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);