X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=2a702801cca988b4e0ab260c5c31f5c3a1fd17b5;hb=3a02c437eadd9a39f7e56056ca987a4846650209;hp=20f1154c00e330a527d1bc8bbf67881080a7c5b3;hpb=c648976f0b7975f2328ebd7ba8c711fad0ca4195;p=freeside.git
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 20f1154c0..2a702801c 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,21 @@
],
'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 { sprintf( $money_char.'%.2f',
+ shift->part_pkg->base_recur
+ );
+ },
sub { #shift->part_pkg->freq_pretty;
#my $part_pkg = $part_pkg{shift->pkgpart};
@@ -50,11 +62,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 +98,7 @@
'',
'',
'',
+ '',
sub { shift->statuscolor; },
'',
'',
@@ -97,16 +109,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,
+ '',
+ '',
'',
'',
'',
@@ -130,8 +147,13 @@
%>
<%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', {});
@@ -172,8 +194,17 @@ foreach my $field (qw( setup last_bill bill adjourn susp expire cancel )) {
my $sql_query = FS::cust_pkg->search_sql(\%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,29 +240,22 @@ sub time_or_blank {
};
}
-my $html_init = '';
-for (qw (overlibmws overlibmws_iframe overlibmws_draggable iframecontentmws))
-{
- $html_init .=
- qq!!;
-}
+my $html_init = include('/elements/init_overlib.html');
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!
Change these packages!;
- }
- return $choices;
+ 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,
+ );
};
%init>