X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_phone.cgi;h=323be63dc93ea36d3db9fae4dcfce16ee6e6be80;hb=8f6c0d7b137391c6dd9cd1397a73293cd575da13;hp=c2379a0791839a1e310bf5bb7b4c06a3420883fe;hpb=8ae589024036a94bb71da0e05f645b00697e271f;p=freeside.git
diff --git a/httemplate/view/svc_phone.cgi b/httemplate/view/svc_phone.cgi
index c2379a079..323be63dc 100644
--- a/httemplate/view/svc_phone.cgi
+++ b/httemplate/view/svc_phone.cgi
@@ -1,10 +1,9 @@
-<% include('elements/svc_Common.html',
+<& elements/svc_Common.html,
'table' => 'svc_phone',
'fields' => \@fields,
- 'labels' => \%labels,
+ 'labels' => \%labels,
'html_foot' => $html_foot,
- )
-%>
+&>
<%init>
my $conf = new FS::Conf;
@@ -19,7 +18,7 @@ my %labels = map { $_ => ( ref($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 route );
+push @fields, qw( pbx_title sip_password pin phone_name forwarddst email );
if ( $conf->exists('svc_phone-lnp') ) {
push @fields, 'lnp_status',
@@ -40,9 +39,9 @@ my $html_foot = sub {
###
my $e911 =
- 'E911 Information'.
+ emt('E911 Information').
&ntable("#cccccc"). '
'. ntable("#cccccc",2).
- ' |
Location | '.
+ '
'.emt('Location').' | '.
''.
$svc_phone->location_label( 'join_string' => ' ',
'double_space' => ' ',
@@ -57,69 +56,10 @@ my $html_foot = sub {
###
# Devices
###
-
- my $devices = '';
-
- my $sth = dbh->prepare("SELECT COUNT(*) FROM part_device") #WHERE disabled = '' OR disabled IS NULL;");
- or die dbh->errstr;
- $sth->execute or die $sth->errstr;
- my $num_part_device = $sth->fetchrow_arrayref->[0];
-
- my @phone_device = $svc_phone->phone_device;
- if ( @phone_device || $num_part_device ) {
- my $svcnum = $svc_phone->svcnum;
- $devices .=
- qq[Devices (Add device) ];
- if ( @phone_device ) {
-
- $devices .= qq!
-
- !;
-
-
- $devices .=
- include('/elements/table-grid.html').
- ' |
'.
- 'Type | '.
- 'MAC Addr | '.
- ' | '.
- ' | '.
- '
';
- my $bgcolor1 = '#eeeeee';
- my $bgcolor2 = '#ffffff';
- my $bgcolor = '';
-
- foreach my $phone_device ( @phone_device ) {
-
- if ( $bgcolor eq $bgcolor1 ) {
- $bgcolor = $bgcolor2;
- } else {
- $bgcolor = $bgcolor1;
- }
- 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).
- ' )'.
- '
';
- }
- $devices .= '
';
- }
- $devices .= '
';
- }
+ my $devices = include('/view/elements/svc_devices.html',
+ 'svc_x' => $svc_phone,
+ 'table' => 'phone_device',
+ );
##
# CDR links
@@ -128,6 +68,7 @@ my $html_foot = sub {
tie my %what, 'Tie::IxHash',
'pending' => 'NULL',
'billed' => 'done',
+ 'skipped' => 'failed',
;
my $number = $svc_phone->phonenum;
@@ -135,21 +76,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().
- # "View $_ CDRs";
- #} keys(%what);
my @links = map {
qq().
"View $_ CDRs";