X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=83cd206cb9d1995917ce1c829ae3cdb4ae27c2db;hb=a6bd5190b8b5434c6b59517fc6467491e00e2edb;hp=4fd5e9d458e929bf2c8b7f90bfe9698b53a394c2;hpb=6191812cbe465d93cf322d64bc525d299530e4a9;p=freeside.git
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 4fd5e9d45..83cd206cb 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,20 +1,26 @@
<% include( 'elements/search.html',
+ 'html_init' => $html_init,
'title' => 'Package Search Results',
'name' => 'packages',
'query' => $sql_query,
'count_query' => $count_query,
#'redirect' => $link,
'header' => [ '#',
+ 'Quan.',
'Package',
'Class',
'Status',
+ 'Setup',
+ 'Base Recur',
'Freq.',
'Setup',
'Last bill',
'Next bill',
+ 'Adjourn',
'Susp.',
'Expire',
'Cancel',
+ 'Reason',
FS::UI::Web::cust_header(
$cgi->param('cust_fields')
),
@@ -22,12 +28,22 @@
],
'fields' => [
'pkgnum',
+ 'quantity',
sub { #my $part_pkg = $part_pkg{shift->pkgpart};
#$part_pkg->pkg; # ' - '. $part_pkg->comment;
$_[0]->pkg; # ' - '. $_[0]->comment;
},
'classname',
sub { ucfirst(shift->status); },
+ sub { sprintf( $money_char.'%.2f',
+ shift->part_pkg->option('setup_fee'),
+ );
+ },
+ sub { my $c = shift;
+ sprintf( $money_char.'%.2f',
+ $c->part_pkg->base_recur($c)
+ );
+ },
sub { #shift->part_pkg->freq_pretty;
#my $part_pkg = $part_pkg{shift->pkgpart};
@@ -43,7 +59,17 @@
#sub { time2str('%b %d %Y', shift->expire); },
#sub { time2str('%b %d %Y', shift->get('cancel')); },
( map { time_or_blank($_) }
- qw( setup last_bill bill susp expire cancel ) ),
+ qw( setup last_bill bill adjourn susp expire cancel ) ),
+
+ sub { my $self = shift;
+ my $return = '';
+ foreach my $action ( qw ( cancel susp ) ) {
+ my $reason = $self->last_reason($action);
+ $return = $reason->reason if $reason;
+ last if $return;
+ }
+ $return;
+ },
\&FS::UI::Web::cust_fields,
#sub { '
'.
@@ -73,6 +99,7 @@
'',
'',
'',
+ '',
sub { shift->statuscolor; },
'',
'',
@@ -81,16 +108,25 @@
'',
'',
'',
+ '',
+ '',
+ '',
+ '',
FS::UI::Web::cust_colors(),
'',
],
- 'style' => [ '', '', '', 'b', '', '', '', '', '', '', '',
+ 'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '',
FS::UI::Web::cust_styles() ],
- 'size' => [ '', '', '', '-1', ],
- 'align' => 'rllclrrrrrr'. FS::UI::Web::cust_aligns(). 'r',
+ 'size' => [ '', '', '', '', '-1' ],
+ 'align' => 'rrlccrrlrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
'links' => [
$link,
$link,
+ $link,
+ '',
+ '',
+ '',
+ '',
'',
'',
'',
@@ -111,196 +147,76 @@
%>
<%init>
-die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('List packages');
-
-# 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,
- "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();
+my $curuser = $FS::CurrentUser::CurrentUser;
-} elsif ( $cgi->param('magic') =~ /^cancell?ed$/
- || $cgi->param('status') =~ /^cancell?ed$/ ) {
+die "access denied"
+ unless $curuser->access_right('List packages');
- push @where, FS::cust_pkg->cancelled_sql();
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
-} elsif ( $cgi->param('status') =~ /^(one-time charge|inactive)$/ ) {
+# my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
- push @where, FS::cust_pkg->inactive_sql();
+my %search_hash = ();
+#some false laziness w/misc/bulk_change_pkg.cgi
+
+$search_hash{'query'} = $cgi->keywords;
+
+for (qw( agentnum custnum magic status classnum custom cust_fields )) {
+ $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
}
-###
-# parse package class
-###
+$search_hash{'pkgpart'} = [ $cgi->param('pkgpart') ];
-#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";
- }
+for my $param ( qw(censustract) ) {
+ $search_hash{$param} = $cgi->param($param) || ''
+ if ( grep { /$param/ } $cgi->param );
}
-#eslaf
-###
-# parse part_pkg
-###
-
-my $pkgpart = join (' OR pkgpart=',
- grep {$_} map { /^(\d+)$/; } ($cgi->param('pkgpart')));
-push @where, '(pkgpart=' . $pkgpart . ')' if $pkgpart;
+my @report_option = $cgi->param('report_option')
+ if $cgi->param('report_option');
+$search_hash{report_option} = join(',', @report_option) if @report_option;
###
# parse dates
###
-my $orderby = '';
-
#false laziness w/report_cust_pkg.html
my %disable = (
'all' => {},
- 'one-time charge' => { 'last_bill'=>1, 'bill'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, },
+ 'one-time charge' => { 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, },
'active' => { 'susp'=>1, 'cancel'=>1 },
'suspended' => { 'cancel' => 1 },
'cancelled' => {},
'' => {},
);
-foreach my $field (qw( setup last_bill bill susp expire cancel )) {
+foreach my $field (qw( setup last_bill bill adjourn susp expire cancel )) {
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
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";
+ $search_hash{$field} = [ $beginning, $ending ];
}
-$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';
+my $sql_query = FS::cust_pkg->search(\%search_hash);
+my $count_query = delete($sql_query->{'count_query'});
-} elsif ( $query eq 'APKG_pkgnum' ) {
-
- $orderby = 'ORDER BY pkgnum';
-
- 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;
-
-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 $show = $curuser->default_customer_view =~ /^(jumbo|packages)$/
+ ? ''
+ : ';show=packages';
my $link = sub {
- [ "${p}view/cust_main.cgi?".shift->custnum.'#cust_pkg', 'pkgnum' ];
+ my $self = shift;
+ my $frag = 'cust_pkg'. $self->pkgnum; #hack for IE ignoring real #fragment
+ [ "${p}view/cust_main.cgi?custnum=".$self->custnum.
+ "$show;fragment=$frag#cust_pkg",
+ 'pkgnum'
+ ];
};
my $clink = sub {
@@ -336,4 +252,32 @@ sub time_or_blank {
};
}
+my $html_init = sub {
+ my $query = shift;
+ my $text = '';
+ my $curuser = $FS::CurrentUser::CurrentUser;
+
+ if ( $curuser->access_right('Bulk change customer packages') ) {
+ $text .= include('/elements/init_overlib.html').
+ 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 ( $curuser->access_right('Edit customer package dates') ) {
+ $text .= 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>