projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change "support time" to use regular ticket time + a custom field, #30921
[freeside.git]
/
httemplate
/
search
/
svc_acct.cgi
diff --git
a/httemplate/search/svc_acct.cgi
b/httemplate/search/svc_acct.cgi
index
c3ddd66
..
b9e5a7c
100755
(executable)
--- a/
httemplate/search/svc_acct.cgi
+++ b/
httemplate/search/svc_acct.cgi
@@
-1,6
+1,6
@@
-<
% include( 'elements/search.html'
,
- 'title' =>
'Account Search Results'
,
- 'name' =>
'accounts'
,
+<
& elements/svc_Common.html
,
+ 'title' =>
emt('Account Search Results')
,
+ 'name' =>
emt('accounts')
,
'query' => $sql_query,
'count_query' => $count_query,
'redirect' => $link,
'query' => $sql_query,
'count_query' => $count_query,
'redirect' => $link,
@@
-11,8
+11,11
@@
'color' => \@color,
'style' => \@style,
'footer' => \@footer,
'color' => \@color,
'style' => \@style,
'footer' => \@footer,
- )
-%>
+ 'html_init' => include('/elements/email-link.html',
+ 'search_hash' => \%search_hash,
+ 'table' => 'svc_acct'
+ ),
+&>
<%once>
#false laziness w/ClientAPI/MyAccount.pm
<%once>
#false laziness w/ClientAPI/MyAccount.pm
@@
-83,7
+86,7
@@
if ( $conf->exists('report-showpasswords') #its a terrible idea
&& $curuser->access_right('List service passwords') #but if you insist...
)
{
&& $curuser->access_right('List service passwords') #but if you insist...
)
{
- push @header,
'Password'
;
+ push @header,
emt('Password')
;
push @fields, 'get_cleartext_password';
push @links, $link;
$align .= 'l';
push @fields, 'get_cleartext_password';
push @links, $link;
$align .= 'l';
@@
-91,7
+94,7
@@
if ( $conf->exists('report-showpasswords') #its a terrible idea
push @style, '';
}
push @style, '';
}
-push @header,
'Real Name'
;
+push @header,
emt('Real Name')
;
push @fields, 'finger';
push @links, $link;
$align .= 'l';
push @fields, 'finger';
push @links, $link;
$align .= 'l';
@@
-100,7
+103,7
@@
push @style, '';
#hide the UID, its much less useful these days
if ( $cgi->param('show_uid') ) { #XXX add a checkbox
#hide the UID, its much less useful these days
if ( $cgi->param('show_uid') ) { #XXX add a checkbox
- push @header,
'UID'
;
+ push @header,
emt('UID')
;
push @fields, 'uid';
push @links, $link;
$align .= 'l';
push @fields, 'uid';
push @links, $link;
$align .= 'l';
@@
-108,7
+111,7
@@
if ( $cgi->param('show_uid') ) { #XXX add a checkbox
push @style, '';
}
push @style, '';
}
-push @header,
'Last Login'
;
+push @header,
emt('Last Login')
;
push @fields, 'last_login_text';
push @links, $link;
$align .= 'r';
push @fields, 'last_login_text';
push @links, $link;
$align .= 'r';
@@
-120,6
+123,10
@@
for (qw( domain domsvc agentnum custnum popnum svcpart cust_fields )) {
$search_hash{$_} = $cgi->param($_) if length($cgi->param($_));
}
$search_hash{$_} = $cgi->param($_) if length($cgi->param($_));
}
+for (qw( towernum sectornum )) {
+ $search_hash{$_} = [ $cgi->param($_) ] if $cgi->param($_);
+}
+
my $timepermonth = '';
my $orderby = 'ORDER BY svcnum';
my $timepermonth = '';
my $orderby = 'ORDER BY svcnum';
@@
-140,8
+147,7
@@
if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
if ( $sortby eq 'seconds' ) {
my $tot_time = 0;
if ( $sortby eq 'seconds' ) {
my $tot_time = 0;
- #push @header, 'Time remaining';
- push @header, 'Time';
+ push @header, emt('Time');
push @fields, sub { my $svc_acct = shift;
$tot_time += $svc_acct->seconds;
format_time($svc_acct->seconds);
push @fields, sub { my $svc_acct = shift;
$tot_time += $svc_acct->seconds;
format_time($svc_acct->seconds);
@@
-158,7
+164,7
@@
if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
if ( $conf->exists('svc_acct-display_paid_time_remaining') ) {
my $tot_paid_time = 0;
my %tot = ( '30'=>0, '60'=>0, '90'=>0 );
if ( $conf->exists('svc_acct-display_paid_time_remaining') ) {
my $tot_paid_time = 0;
my %tot = ( '30'=>0, '60'=>0, '90'=>0 );
- push @header,
'Paid time', 'Last 30', 'Last 60', 'Last 90'
;
+ push @header,
emt('Paid time'), emt('Last 30'), emt('Last 60'), emt('Last 90')
;
push @fields,
sub {
my $svc_acct = shift;
push @fields,
sub {
my $svc_acct = shift;