projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 77332 - updated new search option name to make it more clear.
[freeside.git]
/
httemplate
/
search
/
cust_pkg.cgi
diff --git
a/httemplate/search/cust_pkg.cgi
b/httemplate/search/cust_pkg.cgi
index
297edee
..
2459c44
100755
(executable)
--- a/
httemplate/search/cust_pkg.cgi
+++ b/
httemplate/search/cust_pkg.cgi
@@
-4,11
+4,14
@@
'name' => 'packages',
'query' => $sql_query,
'count_query' => $count_query,
'name' => 'packages',
'query' => $sql_query,
'count_query' => $count_query,
+ 'html_init_data' => $search_string,
'header' => [ emt('#'),
emt('Quan.'),
emt('Package'),
emt('Class'),
emt('Status'),
'header' => [ emt('#'),
emt('Quan.'),
emt('Package'),
emt('Class'),
emt('Status'),
+ emt('Sales Person'),
+ emt('Ordered by'),
emt('Setup'),
emt('Base Recur'),
emt('Freq.'),
emt('Setup'),
emt('Base Recur'),
emt('Freq.'),
@@
-20,6
+23,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,19
+37,21
@@
sub { $_[0]->pkg; },
'classname',
sub { ucfirst(shift->status); },
sub { $_[0]->pkg; },
'classname',
sub { ucfirst(shift->status); },
+ 'salesperson',
+ 'otaker',
sub { sprintf( $money_char.'%.2f',
shift->part_pkg->option('setup_fee'),
);
},
sub { my $c = shift;
sprintf( $money_char.'%.2f',
sub { sprintf( $money_char.'%.2f',
shift->part_pkg->option('setup_fee'),
);
},
sub { my $c = shift;
sprintf( $money_char.'%.2f',
- $c->
part_pkg->base_recur($c)
+ $c->
base_recur
);
},
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
+100,16
@@
'',
'',
'',
'',
'',
'',
+ '',
+ '',
+ '',
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
ccrrlr
rrrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
'links' => [
$link,
$link,
'links' => [
$link,
$link,
@@
-119,6
+128,9
@@
'',
'',
'',
'',
'',
'',
+ '', # link to changed-from package?
+ '',
+ '',
'',
( map { $_ ne 'Cust. Status' ? $clink : '' }
FS::UI::Web::cust_header(
'',
( map { $_ ne 'Cust. Status' ? $clink : '' }
FS::UI::Web::cust_header(
@@
-139,30
+151,44
@@
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
my %search_hash = ();
my $money_char = $conf->config('money_char') || '$';
my %search_hash = ();
+my $search_string;
#some false laziness w/misc/bulk_change_pkg.cgi
$search_hash{'query'} = $cgi->keywords;
#scalars
#some false laziness w/misc/bulk_change_pkg.cgi
$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($_));
+ $search_string .= '&'.$_.'='.$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;
+ $search_string .= '&'.$param.'='.$cgi->param($param) if grep { $_ eq $param } $cgi->param;
}
#scalars that need to be passed if empty
for my $param (qw( censustract censustract2 )) {
$search_hash{$param} = $cgi->param($param) || ''
if grep { $_ eq $param } $cgi->param;
}
#scalars that need to be passed if empty
for my $param (qw( censustract censustract2 )) {
$search_hash{$param} = $cgi->param($param) || ''
if grep { $_ eq $param } $cgi->param;
+ $search_string .= '&'.$param.'='.$cgi->param($param) if grep { $_ eq $param } $cgi->param;
}
}
+#location flags (checkboxes)
+my @loc = grep /^\w+$/, $cgi->param('loc');
+$search_hash{"location_$_"} = 1 foreach @loc;
+$search_string .= '&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;
+$search_string .= '&report_option='.$report_option if $report_option;
for my $param (grep /^report_option_any/, $cgi->param) {
$search_hash{$param} = $cgi->param($param);
for my $param (grep /^report_option_any/, $cgi->param) {
$search_hash{$param} = $cgi->param($param);
@@
-182,7
+208,10
@@
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 change_date cancel active )) {
+
+ $search_hash{$field.'_null'} = scalar( $cgi->param($field.'_null') );
+ $search_string .= '&'.$field.'_null='.scalar( $cgi->param($field.'_null') );
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
@@
-190,6
+219,7
@@
foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end can
or $disable{$cgi->param('status')}->{$field};
$search_hash{$field} = [ $beginning, $ending ];
or $disable{$cgi->param('status')}->{$field};
$search_hash{$field} = [ $beginning, $ending ];
+ $search_string .= '&'.$field.'_begin='.$beginning.'&'.$field.'_end='.$ending;
}
}
@@
-291,11
+321,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],
+ },
+
];
}
}
];
}
}