projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update flat_introrate plan to better fit current codebase RT#4912
[freeside.git]
/
httemplate
/
search
/
cust_pkg.cgi
diff --git
a/httemplate/search/cust_pkg.cgi
b/httemplate/search/cust_pkg.cgi
index
e797e35
..
4e35b91
100755
(executable)
--- a/
httemplate/search/cust_pkg.cgi
+++ b/
httemplate/search/cust_pkg.cgi
@@
-39,8
+39,9
@@
shift->part_pkg->option('setup_fee'),
);
},
shift->part_pkg->option('setup_fee'),
);
},
- sub { sprintf( $money_char.'%.2f',
- shift->part_pkg->base_recur
+ sub { my $c = shift;
+ sprintf( $money_char.'%.2f',
+ $c->part_pkg->base_recur($c)
);
},
sub { #shift->part_pkg->freq_pretty;
);
},
sub { #shift->part_pkg->freq_pretty;
@@
-147,8
+148,10
@@
%>
<%init>
%>
<%init>
+my $curuser = $FS::CurrentUser::CurrentUser;
+
die "access denied"
die "access denied"
- unless $
FS::CurrentUser::CurrentU
ser->access_right('List packages');
+ unless $
curu
ser->access_right('List packages');
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
@@
-159,7
+162,7
@@
my $money_char = $conf->config('money_char') || '$';
$search_hash{'query'} = $cgi->keywords;
$search_hash{'query'} = $cgi->keywords;
- for my $param (qw(agentnum magic status classnum pkgpart)) {
+ for my $param (qw(agentnum magic status classnum pkgpart
custom
)) {
$search_hash{$param} = $cgi->param($param)
if $cgi->param($param);
}
$search_hash{$param} = $cgi->param($param)
if $cgi->param($param);
}
@@
-192,8
+195,17
@@
foreach my $field (qw( setup last_bill bill adjourn susp expire cancel )) {
my $sql_query = FS::cust_pkg->search_sql(\%search_hash);
my $count_query = delete($sql_query->{'count_query'});
my $sql_query = FS::cust_pkg->search_sql(\%search_hash);
my $count_query = delete($sql_query->{'count_query'});
+my $show = $curuser->default_customer_view =~ /^(jumbo|packages)$/
+ ? ''
+ : ';show=packages';
+
my $link = sub {
my $link = sub {
- [ "${p}view/cust_main.cgi?".shift->custnum.'#cust_pkg', 'pkgnum' ];
+ my $self = shift;
+ my $frag = 'cust_pkg'. $self->pkgnum; #hack for IE ignoring real #fragment
+ [ "${p}view/cust_main.cgi?custnum=".$self->custnum.
+ "$show;fragment=$frag#cust_pkg",
+ 'pkgnum'
+ ];
};
my $clink = sub {
};
my $clink = sub {