projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge NG auth, RT#21563
[freeside.git]
/
httemplate
/
search
/
cust_pkg.cgi
diff --git
a/httemplate/search/cust_pkg.cgi
b/httemplate/search/cust_pkg.cgi
index
f0408e4
..
110da91
100755
(executable)
--- a/
httemplate/search/cust_pkg.cgi
+++ b/
httemplate/search/cust_pkg.cgi
@@
-9,6
+9,7
@@
emt('Package'),
emt('Class'),
emt('Status'),
emt('Package'),
emt('Class'),
emt('Status'),
+ emt('Ordered by'),
emt('Setup'),
emt('Base Recur'),
emt('Freq.'),
emt('Setup'),
emt('Base Recur'),
emt('Freq.'),
@@
-20,6
+21,7
@@
emt('Susp. delay'),
emt('Expire'),
emt('Contract end'),
emt('Susp. delay'),
emt('Expire'),
emt('Contract end'),
+ emt('Changed'),
emt('Cancel'),
emt('Reason'),
FS::UI::Web::cust_header(
emt('Cancel'),
emt('Reason'),
FS::UI::Web::cust_header(
@@
-33,6
+35,7
@@
sub { $_[0]->pkg; },
'classname',
sub { ucfirst(shift->status); },
sub { $_[0]->pkg; },
'classname',
sub { ucfirst(shift->status); },
+ 'otaker',
sub { sprintf( $money_char.'%.2f',
shift->part_pkg->option('setup_fee'),
);
sub { sprintf( $money_char.'%.2f',
shift->part_pkg->option('setup_fee'),
);
@@
-45,7
+48,7
@@
sub { FS::part_pkg::freq_pretty(shift); },
( map { time_or_blank($_) }
sub { FS::part_pkg::freq_pretty(shift); },
( map { time_or_blank($_) }
- qw( setup last_bill bill adjourn susp dundate expire contract_end cancel ) ),
+ qw( setup last_bill bill adjourn susp dundate expire contract_end c
hange_date c
ancel ) ),
sub { my $self = shift;
my $return = '';
sub { my $self = shift;
my $return = '';
@@
-94,13
+97,15
@@
'',
'',
'',
'',
'',
'',
+ '',
+ '',
FS::UI::Web::cust_colors(),
'',
],
FS::UI::Web::cust_colors(),
'',
],
- 'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ 'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '', '', '',
'', '',
FS::UI::Web::cust_styles() ],
'size' => [ '', '', '', '', '-1' ],
FS::UI::Web::cust_styles() ],
'size' => [ '', '', '', '', '-1' ],
- 'align' => 'rrlcc
rrl
rrrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
+ 'align' => 'rrlcc
crrlr
rrrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
'links' => [
$link,
$link,
'links' => [
$link,
$link,
@@
-118,6
+123,8
@@
'',
'',
'',
'',
'',
'',
+ '', # link to changed-from package?
+ '',
'',
'',
( map { $_ ne 'Cust. Status' ? $clink : '' }
'',
'',
( map { $_ ne 'Cust. Status' ? $clink : '' }
@@
-161,9
+168,12
@@
for my $param (qw( censustract censustract2 )) {
if grep { $_ eq $param } $cgi->param;
}
if grep { $_ eq $param } $cgi->param;
}
-my @report_option = $cgi->param('report_option')
- if $cgi->param('report_option');
-$search_hash{report_option} = join(',', @report_option) if @report_option;
+my $report_option = $cgi->param('report_option');
+$search_hash{report_option} = $report_option if $report_option;
+
+for my $param (grep /^report_option_any/, $cgi->param) {
+ $search_hash{$param} = $cgi->param($param);
+}
###
# parse dates
###
# parse dates
@@
-179,7
+189,7
@@
my %disable = (
'' => {},
);
'' => {},
);
-foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end cancel active )) {
+foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end c
hange_date c
ancel active )) {
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
@@
-249,7
+259,7
@@
my $html_init = sub {
$text .= include( '/elements/email-link.html',
'search_hash' => \%search_hash,
'table' => 'cust_pkg',
$text .= include( '/elements/email-link.html',
'search_hash' => \%search_hash,
'table' => 'cust_pkg',
- );
+ )
. '<BR><BR>'
;
}
return $text;
};
}
return $text;
};