projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finish up initial work on customer view tabs (ensure links back to customer view...
[freeside.git]
/
httemplate
/
search
/
cust_pkg.cgi
diff --git
a/httemplate/search/cust_pkg.cgi
b/httemplate/search/cust_pkg.cgi
index
bc2f0cb
..
2a70280
100755
(executable)
--- a/
httemplate/search/cust_pkg.cgi
+++ b/
httemplate/search/cust_pkg.cgi
@@
-6,9
+6,12
@@
'count_query' => $count_query,
#'redirect' => $link,
'header' => [ '#',
'count_query' => $count_query,
#'redirect' => $link,
'header' => [ '#',
+ 'Quan.',
'Package',
'Class',
'Status',
'Package',
'Class',
'Status',
+ 'Setup',
+ 'Base Recur',
'Freq.',
'Setup',
'Last bill',
'Freq.',
'Setup',
'Last bill',
@@
-25,12
+28,21
@@
],
'fields' => [
'pkgnum',
],
'fields' => [
'pkgnum',
+ 'quantity',
sub { #my $part_pkg = $part_pkg{shift->pkgpart};
#$part_pkg->pkg; # ' - '. $part_pkg->comment;
$_[0]->pkg; # ' - '. $_[0]->comment;
},
'classname',
sub { ucfirst(shift->status); },
sub { #my $part_pkg = $part_pkg{shift->pkgpart};
#$part_pkg->pkg; # ' - '. $part_pkg->comment;
$_[0]->pkg; # ' - '. $_[0]->comment;
},
'classname',
sub { ucfirst(shift->status); },
+ sub { sprintf( $money_char.'%.2f',
+ shift->part_pkg->option('setup_fee'),
+ );
+ },
+ sub { sprintf( $money_char.'%.2f',
+ shift->part_pkg->base_recur
+ );
+ },
sub { #shift->part_pkg->freq_pretty;
#my $part_pkg = $part_pkg{shift->pkgpart};
sub { #shift->part_pkg->freq_pretty;
#my $part_pkg = $part_pkg{shift->pkgpart};
@@
-50,11
+62,10
@@
sub { my $self = shift;
my $return = '';
sub { my $self = shift;
my $return = '';
- if ($self->getfield('cancel') ||
- $self->getfield('suspend')) {
- my $reason = $self->last_reason;# too inefficient?
- $return = $reason->reason if $reason;
-
+ foreach my $action ( qw ( cancel susp ) ) {
+ my $reason = $self->last_reason($action);
+ $return = $reason->reason if $reason;
+ last if $return;
}
$return;
},
}
$return;
},
@@
-87,6
+98,7
@@
'',
'',
'',
'',
'',
'',
+ '',
sub { shift->statuscolor; },
'',
'',
sub { shift->statuscolor; },
'',
'',
@@
-97,16
+109,21
@@
'',
'',
'',
'',
'',
'',
+ '',
+ '',
FS::UI::Web::cust_colors(),
'',
],
FS::UI::Web::cust_colors(),
'',
],
- 'style' => [ '', '', '', '
b
', '', '', '', '', '', '', '', '', '',
+ 'style' => [ '', '', '', '
', 'b', '', '
', '', '', '', '', '', '', '', '', '',
FS::UI::Web::cust_styles() ],
FS::UI::Web::cust_styles() ],
- 'size' => [ '', '', '', '-1' ],
- 'align' => 'r
lcc
lrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
+ 'size' => [ '', '', '', '
', '
-1' ],
+ 'align' => 'r
rlccrr
lrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
'links' => [
$link,
$link,
'links' => [
$link,
$link,
+ $link,
+ '',
+ '',
'',
'',
'',
'',
'',
'',
@@
-130,8
+147,13
@@
%>
<%init>
%>
<%init>
+my $curuser = $FS::CurrentUser::CurrentUser;
+
die "access denied"
die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('List packages');
+ unless $curuser->access_right('List packages');
+
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
# my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
# my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
@@
-172,8
+194,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 {