X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=97b4412fe715e0dd00ea1dede935dc21766a8ef0;hp=b354bc133f44876977ef1987eff468212ddabe60;hb=d0aca10ecd6edb171555eb87b1570daa3d2820b1;hpb=0b4247f88f8a290a7bbbdebe93404baef2d1e29d

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index b354bc133..97b4412fe 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,4 +1,5 @@
 <% include( 'elements/search.html',
+                  'html_init'   => $html_init, 
                   'title'       => 'Package Search Results', 
                   'name'        => 'packages',
                   'query'       => $sql_query,
@@ -120,6 +121,7 @@
                     ),
                     '',
                   ],
+                  'extra_choices_callback'=> $extra_choices, 
               )
 %>
 <%init>
@@ -129,97 +131,19 @@ die "access denied"
 
 # my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
 
-my($query) = $cgi->keywords;
-
-my @where = ();
-
-##
-# parse agent
-##
-
-if ( $cgi->param('agentnum') =~ /^(\d+)$/ and $1 ) {
-  push @where,
-    "cust_main.agentnum = $1";
-}
-
-##
-# parse status
-##
-
-if (    $cgi->param('magic')  eq 'active'
-     || $cgi->param('status') eq 'active' ) {
-
-  push @where, FS::cust_pkg->active_sql();
-
-} elsif (    $cgi->param('magic')  eq 'inactive'
-          || $cgi->param('status') eq 'inactive' ) {
-
-  push @where, FS::cust_pkg->inactive_sql();
-
-
-} elsif (    $cgi->param('magic')  eq 'suspended'
-          || $cgi->param('status') eq 'suspended'  ) {
-
-  push @where, FS::cust_pkg->suspended_sql();
-
-} elsif (    $cgi->param('magic')  =~ /^cancell?ed$/
-          || $cgi->param('status') =~ /^cancell?ed$/ ) {
-
-  push @where, FS::cust_pkg->cancelled_sql();
-
-} elsif ( $cgi->param('status') =~ /^(one-time charge|inactive)$/ ) {
-
-  push @where, FS::cust_pkg->inactive_sql();
-
-}
-
-###
-# parse package class
-###
-
-#false lazinessish w/graph/cust_bill_pkg.cgi
-my $classnum = 0;
-my @pkg_class = ();
-if ( exists($cgi->Vars->{'classnum'})
-     && $cgi->param('classnum') =~ /^(\d*)$/
-   )
-{
-  $classnum = $1;
-  if ( $classnum ) { #a specific class
-    push @where, "classnum = $classnum";
-
-    #@pkg_class = ( qsearchs('pkg_class', { 'classnum' => $classnum } ) );
-    #die "classnum $classnum not found!" unless $pkg_class[0];
-    #$title .= $pkg_class[0]->classname.' ';
-
-  } elsif ( $classnum eq '' ) { #the empty class
-
-    push @where, "classnum IS NULL";
-    #$title .= 'Empty class ';
-    #@pkg_class = ( '(empty class)' );
-  } elsif ( $classnum eq '0' ) {
-    #@pkg_class = qsearch('pkg_class', {} ); # { 'disabled' => '' } );
-    #push @pkg_class, '(empty class)';
-  } else {
-    die "illegal classnum";
+  my %search_hash = ();
+  
+  $search_hash{'query'} = $cgi->keywords;
+  
+  for my $param (qw(agentnum magic status classnum pkgpart)) {
+    $search_hash{$param} = $cgi->param($param)
+      if $cgi->param($param);
   }
-}
-#eslaf
-
-###
-# parse part_pkg
-###
-
-my $pkgpart = join (' OR pkgpart=',
-                    grep {$_} map { /^(\d+)$/; } ($cgi->param('pkgpart')));
-push @where,  '(pkgpart=' . $pkgpart . ')' if $pkgpart;
 
 ###
 # parse dates
 ###
 
-my $orderby = '';
-
 #false laziness w/report_cust_pkg.html
 my %disable = (
   'all'             => {},
@@ -237,80 +161,12 @@ foreach my $field (qw( setup last_bill bill adjourn susp expire cancel )) {
   next if $beginning == 0 && $ending == 4294967295
        or $disable{$cgi->param('status')}->{$field};
 
-  push @where,
-    "cust_pkg.$field IS NOT NULL",
-    "cust_pkg.$field >= $beginning",
-    "cust_pkg.$field <= $ending";
-
-  $orderby ||= "ORDER BY cust_pkg.$field";
-
-}
-
-$orderby ||= 'ORDER BY bill';
-
-###
-# parse magic, legacy, etc.
-###
-
-if ( $cgi->param('magic') &&
-     $cgi->param('magic') =~ /^(active|inactive|suspended|cancell?ed)$/
-) {
-
-  $orderby = 'ORDER BY pkgnum';
-
-  if ( $cgi->param('pkgpart') =~ /^(\d+)$/ ) {
-    push @where, "pkgpart = $1";
-  }
-
-} elsif ( $query eq 'pkgnum' ) {
-
-  $orderby = 'ORDER BY pkgnum';
-
-} elsif ( $query eq 'APKG_pkgnum' ) {
-
-  $orderby = 'ORDER BY pkgnum';
+  $search_hash{$field} = [ $beginning, $ending ];
 
-  push @where, '0 < (
-    SELECT count(*) FROM pkg_svc
-     WHERE pkg_svc.pkgpart =  cust_pkg.pkgpart
-       AND pkg_svc.quantity > ( SELECT count(*) FROM cust_svc
-                                 WHERE cust_svc.pkgnum  = cust_pkg.pkgnum
-                                   AND cust_svc.svcpart = pkg_svc.svcpart
-                              )
-  )';
-  
 }
 
-##
-# setup queries, links, subs, etc. for the search
-##
-
-# here is the agent virtualization
-push @where, $FS::CurrentUser::CurrentUser->agentnums_sql('table'=>'cust_main');
-
-my $extra_sql = scalar(@where) ? ' WHERE '. join(' AND ', @where) : '';
-
-my $addl_from = 'LEFT JOIN cust_main USING ( custnum  ) '.
-                'LEFT JOIN part_pkg  USING ( pkgpart  ) '.
-                'LEFT JOIN pkg_class USING ( classnum ) ';
-
-my $count_query = "SELECT COUNT(*) FROM cust_pkg $addl_from $extra_sql";
-
-my $sql_query = {
-  'table'     => 'cust_pkg',
-  'hashref'   => {},
-  'select'    => join(', ',
-                            'cust_pkg.*',
-                            ( map "part_pkg.$_", qw( pkg freq ) ),
-                            'pkg_class.classname',
-                            'cust_main.custnum as cust_main_custnum',
-                            FS::UI::Web::cust_sql_fields(
-                              $cgi->param('cust_fields')
-                            ),
-                 ),
-  'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => $addl_from,
-};
+my $sql_query = FS::cust_pkg->search_sql(\%search_hash);
+my $count_query = delete($sql_query->{'count_query'});
 
 my $link = sub {
   [ "${p}view/cust_main.cgi?".shift->custnum.'#cust_pkg', 'pkgnum' ];
@@ -349,4 +205,29 @@ sub time_or_blank {
    };
 }
 
+my $html_init = '';
+for (qw (overlibmws overlibmws_iframe overlibmws_draggable iframecontentmws))
+{
+  $html_init .=
+    qq!<SCRIPT TYPE="text/javascript" SRC="$fsurl/elements/$_.js"></SCRIPT>!;
+}
+
+my $extra_choices = sub {
+  my $query = shift;
+  my $choices = '';
+
+  my $url = qq!overlib( OLiframeContent('!. popurl(2).
+            qq!misc/bulk_change_pkg.cgi?$query', 768, 336, !.
+            qq!'bulk_pkg_change_popup' ), CAPTION, 'Change Packages'!.
+            qq!, STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, !.
+            qq!CLOSECLICK ); return false;!;
+
+  if ($FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages')) {
+    $choices .= qq!<BR><A HREF="javascript:void(0);"!.
+                qq!onClick="$url">Change these packages</A>!;
+  }
+
+  return $choices;
+};
+
 </%init>