X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_phone.cgi;h=3424d34f3193614c7d4f99ae2f4f41480267edd4;hb=8044f0bce5077fc8348c7f7401ed5b8ff4582f75;hp=09d5be483a4851e76e94816175b0b785c2d2a58d;hpb=d906eeadf9576cbdb0e337a774ab17327009ad45;p=freeside.git
diff --git a/httemplate/view/svc_phone.cgi b/httemplate/view/svc_phone.cgi
index 09d5be483..3424d34f3 100644
--- a/httemplate/view/svc_phone.cgi
+++ b/httemplate/view/svc_phone.cgi
@@ -1,15 +1,11 @@
<% include('elements/svc_Common.html',
'table' => 'svc_phone',
- 'fields' => [qw(
- countrycode
- phonenum
- sip_password
- pin
- phone_name
- )],
+ 'fields' => \@fields,
'labels' => {
'countrycode' => 'Country code',
'phonenum' => 'Phone number',
+ 'domain' => 'Domain',
+ 'pbx_title' => 'PBX',
'sip_password' => 'SIP password',
'pin' => 'PIN',
'phone_name' => 'Name',
@@ -19,10 +15,36 @@
%>
<%init>
+my $conf = new FS::Conf;
+my $countrydefault = $conf->config('countrydefault') || 'US';
+
+my @fields = qw( countrycode phonenum );
+push @fields, 'domain' if $conf->exists('svc_phone-domain');
+push @fields, qw( pbx_title sip_password pin phone_name );
+
my $html_foot = sub {
my $svc_phone = shift;
###
+ # E911 Info
+ ###
+
+ my $e911 =
+ 'E911 Information'.
+ &ntable("#cccccc"). '
'. ntable("#cccccc",2).
+ ' |
Location | '.
+ ''.
+ $svc_phone->location_label( 'join_string' => ' ',
+ 'double_space' => ' ',
+ 'escape_function' => \&encode_entities,
+ 'countrydefault' => $countrydefault,
+ ).
+ ' |
'.
+ ''.
+ '
'
+ ;
+
+ ###
# Devices
###
@@ -56,6 +78,7 @@ my $html_foot = sub {
'Type | '.
'MAC Addr | '.
' | '.
+ ' | '.
'';
my $bgcolor1 = '#eeeeee';
my $bgcolor2 = '#ffffff';
@@ -71,10 +94,12 @@ my $html_foot = sub {
my $td = qq();
my $devicenum = $phone_device->devicenum;
+ my $export_links = join( ' ', @{ $phone_device->export_links } );
$devices .= ' | '.
$td. $phone_device->part_device->devicename. ''.
$td. $phone_device->mac_addr. ''.
+ $td. $export_links. ''.
"$td( ".
qq(edit | ).
qq(delete).
@@ -95,29 +120,39 @@ 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().
# "View $_ CDRs";
#} keys(%what);
my @links = map {
- qq().
+ qq().
"View $_ CDRs";
} keys(%what);
- my @ilinks = ( qq().
+ my @ilinks = ( qq().
'View incoming CDRs' );
###
# concatenate & return
###
+ $e911.
$devices.
join(' | ', @links ). '
'.
join(' | ', @ilinks). '
';