X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fsvc_broadband.cgi;h=0517c307a532f95b90669ed9dfc7be315b1efd4d;hb=d9f0a98539cd8dd957ea9a4b5d77fbb739d43d2e;hp=961374e7dc2243caa19244465bf224301836b6bd;hpb=d5cdad7fae9c5e45701a7e83abeb903d31b7983f;p=freeside.git
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 961374e7d..0517c307a 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -1,8 +1,12 @@
<& elements/svc_Common.html,
- table => 'svc_broadband',
- labels => \%labels,
- fields => \@fields,
+ table => 'svc_broadband',
+ labels => \%labels,
+ fields => \@fields,
svc_callback => \&svc_callback,
+ radius_usage => 1,
+ 'manage_link' => scalar($conf->config('svc_broadband-manage_link')),
+ 'manage_link_text' => scalar($conf->config('svc_broadband-manage_link_text')),
+ 'manage_link-new_window' => $conf->exists('svc_broadband-manage_link-new_window')
&>
<%init>
@@ -17,7 +21,6 @@ my %labels = map { $_ => ( ref($fields->{$_})
#my %labels = ();
$labels{'description'} = emt('Description');
-$labels{'router'} = emt('Router');
$labels{'speed_down'} = emt('Download Speed');
$labels{'speed_up'} = emt('Upload Speed');
$labels{'ip_addr'} = emt('IP Address');
@@ -27,31 +30,40 @@ $labels{'coordinates'} = 'Latitude/Longitude';
my @fields = (
'description',
- { field => 'routernum', value => \&router },
+ { field => 'routernum', value_callback => \&router },
'speed_down',
'speed_up',
- { field => 'ip_addr', value => \&ip_addr },
- { field => 'sectornum', value => \§ornum },
- 'mac_addr',
+ { field => 'ip_addr', value_callback => \&ip_addr },
+ { field => 'sectornum', value_callback => \§ornum },
+ { field => 'mac_addr', type=>'mac_addr', value_callback => \&mac_addr },
#'latitude',
#'longitude',
- { field => 'coordinates', value => \&coordinates },
+ { field => 'coordinates', value_callback => \&coordinates },
'altitude',
+
+ 'radio_serialnum',
+ 'radio_location',
+ 'poe_location',
+ 'rssi',
+ 'suid',
+ { field => 'shared_svcnum', value_callback=> \&shared_svcnum, }, #value_callback =>
+
'vlan_profile',
'authkey',
'plan_id',
);
push @fields,
- { field => 'usergroup', value => \&usergroup }
+ { field => 'usergroup', value_callback => \&usergroup }
if $conf->exists('svc_broadband-radius');
sub router {
my $svc = shift;
- my $router = $svc->router or return '';
+ my $router = $svc->router;
my $block = $svc->addr_block;
+ $router = $router->routernum . ': ' . $router->routername if $router;
$block = '; '.$block->cidr if $block;
- $router->routernum . ': ' . $router->routername . $block
+ $router . $block
}
sub ip_addr {
@@ -60,13 +72,26 @@ sub ip_addr {
my $out = $ip_addr;
$out .= ' (' . include('/elements/popup_link-ping.html', ip => $ip_addr) . ')'
if $ip_addr;
+ if ($svc->cust_svc->part_svc->part_export('cacti')) {
+ $out .= ' (cacti)';
+ }
if ( my $addr_block = $svc->addr_block ) {
$out .= '
Netmask: ' . $addr_block->NetAddr->mask .
'
Gateway: ' . $addr_block->ip_gateway;
}
+ $out .= include('/elements/broadband_snmp_get.html', svc => $svc);
$out;
}
+sub mac_addr {
+ my $svc = shift;
+ $svc->mac_addr_formatted('U',':');
+}
+
sub usergroup {
my $svc = shift;
my $usergroup = $svc->usergroup;
@@ -107,9 +132,36 @@ sub coordinates {
);
}
+sub shared_svcnum {
+ my $svc_broadband = shift;
+ return '' unless $svc_broadband->shared_svcnum;
+
+ my $shared_svc_broadband =
+ qsearchs('svc_broadband', { 'svcnum' => $svc_broadband->shared_svcnum,
+ }
+ #agent virt?
+ )
+ or return '';
+ my $shared_cust_pkg = $shared_svc_broadband->cust_svc->cust_pkg;
+
+ $shared_svc_broadband->label.
+ ( $shared_cust_pkg
+ ? ' ('. $shared_cust_pkg->cust_main->name. ')'
+ : ''
+ );
+}
+
sub svc_callback {
# trying to move to the callback style
my ($cgi, $svc_x, $part_svc, $cust_pkg, $fields, $opt) = @_;
+
+ if ( $part_svc->part_svc_column('latitude')->columnflag eq 'F'
+ && $part_svc->part_svc_column('longitude')->columnflag eq 'F'
+ )
+ {
+ @$fields = grep { !ref($_) || $_->{field} ne 'coordinates' } @$fields;
+ }
+
# again, we assume at most one of these exports per part_svc
my ($nas_export) = $part_svc->part_export('broadband_nas');
if ( $nas_export ) {