X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=2a4366ae4dd09fa10fb7f0ba278c2ad8cec5d606;hb=2419a740ea77d7c1fd2151dbf8822fc40fd94053;hp=a2ea3c582e521f4fc67f11ca53d44c63ef482769;hpb=e300f21783a78b911256e04cd7af86b1d57eeb04;p=freeside.git

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index a2ea3c582..2a4366ae4 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -158,14 +158,22 @@ my $money_char = $conf->config('money_char') || '$';
 
 # my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
 
-  my %search_hash = ();
+my %search_hash = ();
+
+#some false laziness w/misc/bulk_change_pkg.cgi
   
-  $search_hash{'query'} = $cgi->keywords;
+$search_hash{'query'} = $cgi->keywords;
   
-  for ( qw(agentnum magic status classnum pkgpart custom censustract) ) {
-    $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
-  }
+for (qw( agentnum custnum magic status classnum custom cust_fields )) {
+  $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
+}
 
+$search_hash{'pkgpart'} = [ $cgi->param('pkgpart') ];
+
+for my $param ( qw(censustract) ) {
+  $search_hash{$param} = $cgi->param($param) || ''
+    if ( grep { /$param/ } $cgi->param );
+}
 
 my @report_option = $cgi->param('report_option')
   if $cgi->param('report_option');
@@ -196,7 +204,7 @@ foreach my $field (qw( setup last_bill bill adjourn susp expire cancel )) {
 
 }
 
-my $sql_query = FS::cust_pkg->search_sql(\%search_hash);
+my $sql_query = FS::cust_pkg->search(\%search_hash);
 my $count_query = delete($sql_query->{'count_query'});
 
 my $show = $curuser->default_customer_view =~ /^(jumbo|packages)$/
@@ -249,18 +257,29 @@ my $html_init = include('/elements/init_overlib.html');
 
 my $extra_choices = sub {
   my $query = shift;
+  my $text = '';
 
-  return '' unless
-   $FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages');
-    
-  '<BR><BR>'.
-  include( '/elements/popup_link.html',
-             'label'       => 'Change these packages',
-             'action'      => "${p}misc/bulk_change_pkg.cgi?$query",
-             'actionlabel' => 'Change Packages',
-             'width'       => 763,
-             'height'      => 336,
-         );
+  if( $FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages') ) {
+    $text .= '<BR><BR>'.
+            include( '/elements/popup_link.html',
+              'label'       => 'Change these packages',
+              'action'      => "${p}misc/bulk_change_pkg.cgi?$query",
+              'actionlabel' => 'Change Packages',
+              'width'       => 569,
+              'height'      => 210,
+            );
+    if( $FS::CurrentUser::CurrentUser->access_right('Edit customer package dates') ) {
+      $text .= '<BR>'.
+              include( '/elements/popup_link.html',
+                'label'       => 'Increment next bill date',
+                'action'      => "${p}misc/bulk_pkg_increment_bill.cgi?$query",
+                'actionlabel' => 'Increment Bill Date',
+                'width'       => 569,
+                'height'      => 210,
+                );
+    }
+  }
+  return $text;
 };
 
 </%init>