projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
run_bill_events option for order_pkg, RT#42053
[freeside.git]
/
httemplate
/
search
/
cust_pkg.cgi
diff --git
a/httemplate/search/cust_pkg.cgi
b/httemplate/search/cust_pkg.cgi
index
1cb61bc
..
dbd346d
100755
(executable)
--- a/
httemplate/search/cust_pkg.cgi
+++ b/
httemplate/search/cust_pkg.cgi
@@
-44,7
+44,7
@@
},
sub { my $c = shift;
sprintf( $money_char.'%.2f',
},
sub { my $c = shift;
sprintf( $money_char.'%.2f',
- $c->
part_pkg->base_recur($c)
+ $c->
base_recur
);
},
sub { FS::part_pkg::freq_pretty(shift); },
);
},
sub { FS::part_pkg::freq_pretty(shift); },
@@
-156,12
+156,16
@@
my %search_hash = ();
$search_hash{'query'} = $cgi->keywords;
#scalars
$search_hash{'query'} = $cgi->keywords;
#scalars
-for (qw( agentnum custnum magic status custom cust_fields pkgbatch )) {
- $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
+for (qw( agentnum cust_status cust_main_salesnum salesnum custnum magic status
+ custom cust_fields pkgbatch zip
+ 477part 477rownum date
+ ))
+{
+ $search_hash{$_} = $cgi->param($_) if length($cgi->param($_));
}
#arrays
}
#arrays
-for my $param (qw( pkgpart classnum )) {
+for my $param (qw( pkgpart classnum
refnum towernum
)) {
$search_hash{$param} = [ $cgi->param($param) ]
if grep { $_ eq $param } $cgi->param;
}
$search_hash{$param} = [ $cgi->param($param) ]
if grep { $_ eq $param } $cgi->param;
}
@@
-172,6
+176,10
@@
for my $param (qw( censustract censustract2 )) {
if grep { $_ eq $param } $cgi->param;
}
if grep { $_ eq $param } $cgi->param;
}
+#location flags (checkboxes)
+my @loc = grep /^\w+$/, $cgi->param('loc');
+$search_hash{"location_$_"} = 1 foreach @loc;
+
my $report_option = $cgi->param('report_option');
$search_hash{report_option} = $report_option if $report_option;
my $report_option = $cgi->param('report_option');
$search_hash{report_option} = $report_option if $report_option;
@@
-302,11
+310,14
@@
my $process_svc_labels = sub {
foreach ( map { [ $_->label ] } @{ $part_svc->cust_pkg_svc } ) {
push @out, [
{ 'data' => $_->[0]. ':',
foreach ( map { [ $_->label ] } @{ $part_svc->cust_pkg_svc } ) {
push @out, [
{ 'data' => $_->[0]. ':',
- 'align'=> 'right', },
+ 'align'=> 'right',
+ },
+
{ 'data' => $_->[1],
'align'=> 'left',
{ 'data' => $_->[1],
'align'=> 'left',
- 'link' => $p. 'view/' .
- $_->[2]. '.cgi?'. $_->[3], },
+ 'link' => $p. 'view/cust_svc.cgi?' . $_->[3],
+ },
+
];
}
}
];
}
}