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

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index f03bbc26b..2a4366ae4 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -164,7 +164,7 @@ my %search_hash = ();
   
 $search_hash{'query'} = $cgi->keywords;
   
-for (qw( agentnum magic status classnum custom )) {
+for (qw( agentnum custnum magic status classnum custom cust_fields )) {
   $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
 }
 
@@ -204,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)$/
@@ -257,18 +257,29 @@ my $html_init = include('/elements/init_overlib.html');
 
 my $extra_choices = sub {
   my $query = shift;
-
-  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,
-         );
+  my $text = '';
+
+  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>