projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#34494: Add routername to advanced wireless broadband report
[freeside.git]
/
httemplate
/
search
/
svc_broadband.cgi
diff --git
a/httemplate/search/svc_broadband.cgi
b/httemplate/search/svc_broadband.cgi
index
8366d21
..
ad1a2c5
100755
(executable)
--- a/
httemplate/search/svc_broadband.cgi
+++ b/
httemplate/search/svc_broadband.cgi
@@
-10,6
+10,7
@@
'Router',
@tower_header,
'IP Address',
'Router',
@tower_header,
'IP Address',
+ 'Attached Router',
FS::UI::Web::cust_header($cgi->param('cust_fields')),
],
'fields' => [ 'svcnum',
FS::UI::Web::cust_header($cgi->param('cust_fields')),
],
'fields' => [ 'svcnum',
@@
-20,6
+21,11
@@
},
@tower_fields,
'ip_addr',
},
@tower_fields,
'ip_addr',
+ sub {
+ my $svc = shift;
+ my $router = qsearchs('router', { svcnum => $svc->svcnum });
+ return $router ? $router->routername : '';
+ },
\&FS::UI::Web::cust_fields,
],
'links' => [ $link,
\&FS::UI::Web::cust_fields,
],
'links' => [ $link,
@@
-27,11
+33,12
@@
'', #$link_router,
(map '', @tower_fields),
$link,
'', #$link_router,
(map '', @tower_fields),
$link,
+ '',
( map { $_ ne 'Cust. Status' ? $link_cust : '' }
FS::UI::Web::cust_header($cgi->param('cust_fields'))
),
],
( map { $_ ne 'Cust. Status' ? $link_cust : '' }
FS::UI::Web::cust_header($cgi->param('cust_fields'))
),
],
- 'align' => 'rll'.('r' x @tower_fields).'r'.
+ 'align' => 'rll'.('r' x @tower_fields).'r
l
'.
FS::UI::Web::cust_aligns(),
'color' => [
'',
FS::UI::Web::cust_aligns(),
'color' => [
'',
@@
-39,6
+46,7
@@
'',
(map '', @tower_fields),
'',
'',
(map '', @tower_fields),
'',
+ '',
FS::UI::Web::cust_colors(),
],
'style' => [
FS::UI::Web::cust_colors(),
],
'style' => [
@@
-47,6
+55,7
@@
'',
(map '', @tower_fields),
'',
'',
(map '', @tower_fields),
'',
+ '',
FS::UI::Web::cust_styles(),
],
FS::UI::Web::cust_styles(),
],
@@
-61,9
+70,8
@@
my $conf = new FS::Conf;
my %search_hash;
if ( $cgi->param('magic') eq 'unlinked' ) {
%search_hash = ( 'unlinked' => 1 );
my %search_hash;
if ( $cgi->param('magic') eq 'unlinked' ) {
%search_hash = ( 'unlinked' => 1 );
-}
-else {
- foreach (qw(custnum agentnum svcpart)) {
+} else {
+ foreach (qw( custnum agentnum svcpart cust_fields )) {
$search_hash{$_} = $cgi->param($_) if $cgi->param($_);
}
foreach (qw(pkgpart routernum towernum sectornum)) {
$search_hash{$_} = $cgi->param($_) if $cgi->param($_);
}
foreach (qw(pkgpart routernum towernum sectornum)) {