X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_phone.cgi;h=323be63dc93ea36d3db9fae4dcfce16ee6e6be80;hb=5214a5560240667a3a914c45df046b420926a5ec;hp=6e40fea54d0a3036a48a3e9b679bf9a879c6b7d9;hpb=b5c4237a34aef94976bc343c8d9e138664fc3984;p=freeside.git
diff --git a/httemplate/view/svc_phone.cgi b/httemplate/view/svc_phone.cgi
index 6e40fea54..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;
@@ -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;