X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=2459c44b2138ca13e60cebf08ae02491f666cd2e;hb=3120e258a9a859bba3b64e493cf6d922d8b49e4c;hp=dbd346dba3dc2d78fb14d1a65b0f1fc59e318a07;hpb=dd72ad399c69875b14703e9086f8cedb88acb518;p=freeside.git

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index dbd346dba..2459c44b2 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -4,6 +4,7 @@
                   'name'        => 'packages',
                   'query'       => $sql_query,
                   'count_query' => $count_query,
+                  'html_init_data' => $search_string,
                   'header'      => [ emt('#'),
                                      emt('Quan.'),
                                      emt('Package'),
@@ -150,6 +151,7 @@ my $conf = new FS::Conf;
 my $money_char = $conf->config('money_char') || '$';
 
 my %search_hash = ();
+my $search_string;
 
 #some false laziness w/misc/bulk_change_pkg.cgi
   
@@ -162,26 +164,31 @@ for (qw( agentnum cust_status cust_main_salesnum salesnum custnum magic status
     )) 
 {
   $search_hash{$_} = $cgi->param($_) if length($cgi->param($_));
+  $search_string .= '&'.$_.'='.$cgi->param($_) if length($cgi->param($_));
 }
 
 #arrays
 for my $param (qw( pkgpart classnum refnum towernum )) {
   $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;
+  $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;
+$search_string .= '&report_option='.$report_option if $report_option;
 
 for my $param (grep /^report_option_any/, $cgi->param) {
   $search_hash{$param} = $cgi->param($param);
@@ -203,12 +210,16 @@ my %disable = (
 
 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);
 
   next if $beginning == 0 && $ending == 4294967295
        or $disable{$cgi->param('status')}->{$field};
 
   $search_hash{$field} = [ $beginning, $ending ];
+  $search_string .= '&'.$field.'_begin='.$beginning.'&'.$field.'_end='.$ending;
 
 }