[freeside-commits] freeside/httemplate/search cust_pkg.cgi, 1.46, 1.47
Jeff Finucane,420,,
jeff at wavetail.420.am
Mon Jan 28 19:34:14 PST 2008
Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv17659/httemplate/search
Modified Files:
cust_pkg.cgi
Log Message:
bulk package changing (RT#1394)
Index: cust_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pkg.cgi,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- cust_pkg.cgi 4 Dec 2007 18:35:55 -0000 1.46
+++ cust_pkg.cgi 29 Jan 2008 03:34:12 -0000 1.47
@@ -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 @@
# 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 @@
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 @@
};
}
+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>
More information about the freeside-commits
mailing list