projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#17599: display cancelled services from history [doc fix]
[freeside.git]
/
httemplate
/
search
/
svc_broadband.cgi
diff --git
a/httemplate/search/svc_broadband.cgi
b/httemplate/search/svc_broadband.cgi
index
ad1a2c5
..
8cdf29d
100755
(executable)
--- a/
httemplate/search/svc_broadband.cgi
+++ b/
httemplate/search/svc_broadband.cgi
@@
-10,7
+10,7
@@
'Router',
@tower_header,
'IP Address',
'Router',
@tower_header,
'IP Address',
-
'Attached Router'
,
+
emt('Pkg. Status')
,
FS::UI::Web::cust_header($cgi->param('cust_fields')),
],
'fields' => [ 'svcnum',
FS::UI::Web::cust_header($cgi->param('cust_fields')),
],
'fields' => [ 'svcnum',
@@
-22,9
+22,9
@@
@tower_fields,
'ip_addr',
sub {
@tower_fields,
'ip_addr',
sub {
-
my $svc = shift
;
-
my $router = qsearchs('router', { svcnum => $svc->svcnum })
;
- return $router ? $router->routername : '';
+
$cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg
;
+
return '' unless $cust_pkg_cache{$_[0]->svcnum}
;
+ $cust_pkg_cache{$_[0]->svcnum}->ucfirst_status
},
\&FS::UI::Web::cust_fields,
],
},
\&FS::UI::Web::cust_fields,
],
@@
-33,12
+33,12
@@
'', #$link_router,
(map '', @tower_fields),
$link,
'', #$link_router,
(map '', @tower_fields),
$link,
- '',
+ '',
# pkg status
( 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
l
'.
+ 'align' => 'rll'.('r' x @tower_fields).'r
r
'.
FS::UI::Web::cust_aligns(),
'color' => [
'',
FS::UI::Web::cust_aligns(),
'color' => [
'',
@@
-46,7
+46,12
@@
'',
(map '', @tower_fields),
'',
'',
(map '', @tower_fields),
'',
- '',
+ sub {
+ $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
+ my $c = FS::cust_pkg::statuscolors;
+ $c->{$cust_pkg_cache{$_[0]->svcnum}->status };
+ }, # pkg status
FS::UI::Web::cust_colors(),
],
'style' => [
FS::UI::Web::cust_colors(),
],
'style' => [
@@
-55,7
+60,7
@@
'',
(map '', @tower_fields),
'',
'',
(map '', @tower_fields),
'',
- '',
+ '
b
',
FS::UI::Web::cust_styles(),
],
FS::UI::Web::cust_styles(),
],
@@
-65,6
+70,8
@@
die "access denied" unless
$FS::CurrentUser::CurrentUser->access_right('List services');
die "access denied" unless
$FS::CurrentUser::CurrentUser->access_right('List services');
+my %cust_pkg_cache;
+
my $conf = new FS::Conf;
my %search_hash;
my $conf = new FS::Conf;
my %search_hash;
@@
-77,6
+84,9
@@
if ( $cgi->param('magic') eq 'unlinked' ) {
foreach (qw(pkgpart routernum towernum sectornum)) {
$search_hash{$_} = [ $cgi->param($_) ] if $cgi->param($_);
}
foreach (qw(pkgpart routernum towernum sectornum)) {
$search_hash{$_} = [ $cgi->param($_) ] if $cgi->param($_);
}
+ if ( defined($cgi->param('cancelled')) ) {
+ $search_hash{'cancelled'} = $cgi->param('cancelled') ? 1 : 0;
+ }
}
if ( $cgi->param('sortby') =~ /^(\w+)$/ ) {
}
if ( $cgi->param('sortby') =~ /^(\w+)$/ ) {
@@
-114,5
+124,9
@@
my $html_init = include('/elements/email-link.html',
'search_hash' => \%search_hash,
'table' => 'svc_broadband'
);
'search_hash' => \%search_hash,
'table' => 'svc_broadband'
);
+$html_init .= ' | ' .
+ '<a href="' .
+ $fsurl . 'search/svc_broadband-map.html?' . $cgi->query_string .
+ '">' . emt('View a map of these services') . '</a>';
</%init>
</%init>