X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=83cd206cb9d1995917ce1c829ae3cdb4ae27c2db;hb=fed83c5c6c86a9ab00bb30481f5bf3937910da54;hp=bc2f0cbced5ce76db17d12ff567fe82f270a6b2c;hpb=69613d0ed870f245f3cd2adf0faaf1b3c1bde3ad;p=freeside.git
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index bc2f0cbce..83cd206cb 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -6,9 +6,12 @@
'count_query' => $count_query,
#'redirect' => $link,
'header' => [ '#',
+ 'Quan.',
'Package',
'Class',
'Status',
+ 'Setup',
+ 'Base Recur',
'Freq.',
'Setup',
'Last bill',
@@ -25,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};
@@ -50,11 +63,10 @@
sub { my $self = shift;
my $return = '';
- if ($self->getfield('cancel') ||
- $self->getfield('suspend')) {
- my $reason = $self->last_reason;# too inefficient?
- $return = $reason->reason if $reason;
-
+ foreach my $action ( qw ( cancel susp ) ) {
+ my $reason = $self->last_reason($action);
+ $return = $reason->reason if $reason;
+ last if $return;
}
$return;
},
@@ -87,6 +99,7 @@
'',
'',
'',
+ '',
sub { shift->statuscolor; },
'',
'',
@@ -97,16 +110,21 @@
'',
'',
'',
+ '',
+ '',
FS::UI::Web::cust_colors(),
'',
],
- 'style' => [ '', '', '', 'b', '', '', '', '', '', '', '', '', '',
+ 'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '',
FS::UI::Web::cust_styles() ],
- 'size' => [ '', '', '', '-1' ],
- 'align' => 'rlcclrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
+ 'size' => [ '', '', '', '', '-1' ],
+ 'align' => 'rrlccrrlrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
'links' => [
$link,
$link,
+ $link,
+ '',
+ '',
'',
'',
'',
@@ -125,24 +143,40 @@
),
'',
],
- 'extra_choices_callback'=> $extra_choices,
)
%>
<%init>
+my $curuser = $FS::CurrentUser::CurrentUser;
+
die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('List packages');
+ unless $curuser->access_right('List packages');
+
+my $conf = new FS::Conf;
+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 my $param (qw(agentnum magic status classnum pkgpart)) {
- $search_hash{$param} = $cgi->param($param)
- if $cgi->param($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');
+$search_hash{report_option} = join(',', @report_option) if @report_option;
###
# parse dates
@@ -169,11 +203,20 @@ 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)$/
+ ? ''
+ : ';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 {
@@ -209,22 +252,32 @@ sub time_or_blank {
};
}
-my $html_init = include('/elements/init_overlib.html');
-
-my $extra_choices = sub {
+my $html_init = sub {
my $query = shift;
+ my $text = '';
+ my $curuser = $FS::CurrentUser::CurrentUser;
- return '' unless
- $FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages');
-
- '
'.
- 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 ( $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>