X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_phone.cgi;h=ffb6fcc4aac2c859d4feb5b35720e8fa06b0dbbe;hb=dcbcdb1ed71883f8a88eda28f89d8835c38c514e;hp=27d270c89b1fc416f79e7c8e74ef7875534defd5;hpb=106f396d4d9f14859674bc6156027a33e0b093ab;p=freeside.git

diff --git a/httemplate/view/svc_phone.cgi b/httemplate/view/svc_phone.cgi
index 27d270c89..ffb6fcc4a 100644
--- a/httemplate/view/svc_phone.cgi
+++ b/httemplate/view/svc_phone.cgi
@@ -1,26 +1,35 @@
-<% include('elements/svc_Common.html',
+<& elements/svc_Common.html,
               'table'     => 'svc_phone',
               'fields'    => \@fields,
-              'labels'    => {
-                               'countrycode'  => 'Country code',
-                               'phonenum'     => 'Phone number',
-                               'domain'       => 'Domain',
-                               'pbx_title'    => 'PBX',
-                               'sip_password' => 'SIP password',
-                               'pin'          => 'PIN',
-                               'phone_name'   => 'Name',
-                             },
+	          'labels'    => \%labels,
               'html_foot' => $html_foot,
-          )
-%>
+&>
 <%init>
 
 my $conf = new FS::Conf;
 my $countrydefault = $conf->config('countrydefault') || 'US';
 
+my $fields = FS::svc_phone->table_info->{'fields'};
+my %labels = map { $_ =>  ( ref($fields->{$_})
+                             ? $fields->{$_}{'label'}
+                             : $fields->{$_}
+                         );
+                 } keys %$fields;
+
 my @fields = qw( countrycode phonenum );
 push @fields, 'domain' if $conf->exists('svc_phone-domain');
-push @fields, qw( pbx_title sip_password pin phone_name );
+push @fields, qw( pbx_title sip_password pin phone_name forwarddst email );
+
+if ( $conf->exists('svc_phone-lnp') ) {
+push @fields, 'lnp_status',
+	    'lnp_reject_reason',
+	    { field => 'portable', type => 'checkbox', },
+	    'lrn',
+	    { field => 'lnp_desired_due_date', type => 'date', },
+	    { field => 'lnp_due_date', type => 'date', },
+	    'lnp_other_provider',
+	    'lnp_other_provider_account';
+}
 
 my $html_foot = sub {
   my $svc_phone = shift;
@@ -30,9 +39,9 @@ my $html_foot = sub {
   ###
 
   my $e911 = 
-    'E911 Information'.
+    emt('E911 Information').
     &ntable("#cccccc"). '<TR><TD>'. ntable("#cccccc",2).
-      '<TR><TD>Location</TD>'.
+      '<TR><TD>'.emt('Location').'</TD>'.
       '<TD BGCOLOR="#FFFFFF">'.
         $svc_phone->location_label( 'join_string'     => '<BR>',
                                     'double_space'    => ' &nbsp; ',
@@ -125,21 +134,30 @@ my $html_foot = sub {
     unless $svc_phone->countrycode eq '1';
 
   #src & charged party as per voip_cdr.pm
-  my $search;
+  #XXX handle toll free too
+
+  my $search = "charged_party_or_src=";
+
   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";
+
+  if ( $cust_pkg ) {
+
+    #XXX handle voip_inbound too
+
+    my @part_pkg = grep { $_->plan eq 'voip_cdr' }
+                        $cust_pkg->part_pkg->self_and_bill_linked;
+
+    foreach my $prefix (grep $_, map $_->option('default_prefix'), @part_pkg) {
+      $number .= ",$prefix$number";
+    }
+
+    $search = 'charged_party='
+      unless !@part_pkg || grep { ! $_->option('disable_src',1) } @part_pkg;
+
   }
 
-  #XXX default prefix as per voip_cdr.pm
-  #XXX handle toll free too
+  $search .= $number;
 
-  #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__;$search;freesidestatus=$what{$_}">).
     "View $_ CDRs</A>";