X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=0dc65a7885a1624a064378497697e8e8c98cc7cf;hb=0e115ecd7e70269ac58ce705adec4b1c801d14de;hp=e32fe4c03caf3edaae5fc80a22d4ff8699a74f7b;hpb=05eb6fd62056682d8760b85ced91dabd33357a3b;p=freeside.git
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index e32fe4c03..0dc65a788 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -3,7 +3,6 @@ td.package {
vertical-align: top;
border-width: 0;
border-style: solid;
- border-color: #bbbbff;
}
table.package {
border: none;
@@ -23,57 +22,130 @@ table.usage {
.row0 { background-color: #eeeeee; }
.row1 { background-color: #ffffff; }
-
-
-% unless ( $opt{no_links} ) {
-
-% my $s = 0;
-
-% if ( $curuser->access_right('Qualify service') ) {
- <% $s++ ? ' | ' : '' %>
- <& qual_link.html, $cust_main &>
-% }
-
-% if ( $curuser->access_right('Order customer package') ) {
- <% $s++ ? ' | ' : '' %>
- <& /elements/order_pkg_link.html, 'cust_main'=>$cust_main &>
-% }
-
-% if ( $curuser->access_right('One-time charge')
-% && $conf->config('payby-default') ne 'HIDE'
-% ) {
- <% $s++ ? ' | ' : '' %>
- <& one_time_charge_link.html, $cust_main &>
-% }
-
-% if ( $curuser->access_right('Bulk move customer services') ) {
- <% $s++ ? ' | ' : '' %>
-
- <& /elements/popup_link-cust_main.html,
- 'label' => emt('Move services between packages'),
- 'action' => "${p}edit/bulk-cust_svc-pkgnum.html",
- 'cust_main' => $cust_main,
- 'actionlabel' => emt('Move services'),
- 'width' => 968, #763,
- 'height' => 575,
- &>
+table.hiddenrows {
+ width: 80%;
+ margin-left: 100px;
+ border: 1px solid #7E0079;
+ background-color: #cccccc;
+}
-% }
+.hiddenrows td {
+ text-align: center;
+}
-% if ( $curuser->access_right('Bulk change customer packages') ) {
- <% $s++ ? ' | ' : '' %>
- <% mt('Bulk order and cancel packages') |h %>
-% }
+.rolldown_button {
+ min-width: 80px;
+ margin-left: 100px;
+ min-height: 20px;
+ background-color: #efefef;
+ border: 1px solid #7e0079;
+ z-index: 1;
+ text-align: center;
+}
-
+
-% } # unless $opt{no_links}
+% # activate rolldown buttons for hidden package blocks
+
+% my $br = 0;
+
+% if ( $total_pkgs > $maxrecords ) {
+
+% if ( 1 ) { #FS::pkg_class->num_pkg_class ) {
+ <% $br++ ? ' | ' : '' %>
+ Class: <& /elements/select-cust-pkg_class.html,
+ curr_value => scalar($cgi->param('classnum')),
+ onchange => 'classnum_changed(this);',
+ pre_options => [ '-1' => 'all',
+ '0' => '(none)',
+ ],
+ &>
+% }
+
+ <% $br++ ? ' | ' : '' %>
+ Status: <& /elements/select-cust_pkg-status.html,
+ curr_value => scalar($cgi->param('status')),
+ onchange => 'status_changed(this);',
+ &>
+
+% if ( 1 ) { #$cust_main->num_cust_location ) {
+ <% $br++ ? ' | ' : '' %>
+ Location: <& /elements/select-cust_location.html,
+ cust_main => $cust_main,
+ curr_value => scalar($cgi->param('locationnum')),
+ addnew => 0,
+ onchange => 'locationnum_changed(this);',
+ pre_options => [ '-1' => 'all', ],
+ &>
+% }
+
+
+
+% }
+
% if ( $cust_main->num_cancelled_pkgs ) {
+ <% $br++ ? ' | ' : '' %>
% if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
% || ( $conf->exists('hidecancelledpackages')
% && ! $cgi->param('showcancelledpackages')
@@ -82,75 +154,71 @@ table.usage {
% {
% my $prev = $cgi->param('showcancelledpackages');
% $cgi->param('showcancelledpackages', 1);
- ( <% mt('show') |h %>
+ <% mt('show') |h %>
% $cgi->param('showcancelledpackages', $prev);
% } else {
% $cgi->param('showcancelledpackages', 0);
- ( <% mt('hide') |h %>
+ <% mt('hide') |h %>
% $cgi->param('showcancelledpackages', 1);
% }
- <% mt('cancelled packages') |h %> )
+ <% mt('cancelled packages') |h %>
% }
-% if ( $num_old_packages ) {
+
+<% $br++ ? ' | ' : '' %>
+% if ( $cgi->param('showoldpackages') ) {
+% $cgi->param('showoldpackages', 0);
+ <% mt('hide old packages') |h %>
% $cgi->param('showoldpackages', 1);
- ( <% mt('show old packages') |h %> )
-% } elsif ( $cgi->param('showoldpackages') ) {
+% } else {
+% $cgi->param('showoldpackages', 1);
+ <% mt('show old packages') |h %>
% $cgi->param('showoldpackages', 0);
- ( <% mt('hide old packages') |h %> )
% }
|
-% unless ( $opt{no_links} ) {
+
-
- <% mt('Package reports') |h %>
-% if ( $curuser->access_right('Qualify service') ) {
- | <% mt('View Qualifications') |h %>
-% }
-
- <% mt('Service reports:') |h %>
- <% mt('accounts') |h %>
- <% mt('Usage reports:') |h %>
- <% mt('CDRs') |h %>
+% my $pager = include('/elements/pager.html',
+% offset => $offset,
+% num_rows => scalar(@packages),
+% total => $num_pkgs,
+% maxrecords => $maxrecords,
+% );
+% if ( $num_pkgs > $maxrecords ) {
+ |
+
+ <% $pager %>
|
+
+% }
+
+
+
-% } # unless $opt{no_links}
+% $opt{cust_main} = $cust_main;
+% $opt{packages} = \@packages;
+% $opt{cust_location_cache} = {};
+% if ( $conf->exists('cust_pkg-group_by_location') ) {
+ <& locations.html, %opt &>
+% } else { # in this format, put all packages in one section
+ <& /elements/table-grid.html &>
+ <& packages/section.html, %opt &>
+ |
+% }
+
+% if ( $num_pkgs > $maxrecords ) {
-% if ( $conf->exists('cust_pkg-group_by_location') ) {
-<& locations.html,
- 'cust_main' => $cust_main,
- 'packages' => $packages,
- %opt,
- &>
-% }
-% else {
-% # in this format, put all packages in one section
-<& /elements/table-grid.html &>
-<& packages/section.html,
- 'cust_main' => $cust_main,
- 'packages' => $packages,
- %opt,
- &>
-
-% }
+ <% $pager %>
|
-
-% if ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) {
-
% }
+
<%init>
@@ -160,74 +228,145 @@ my $conf = new FS::Conf;
my $curuser = $FS::CurrentUser::CurrentUser;
-my( $packages, $num_old_packages ) = get_packages($cust_main, $conf);
-
my $countrydefault = scalar($conf->config('countrydefault')) || 'US';
-#subroutines
-
-sub get_packages {
- my $cust_main = shift or return undef;
- my $conf = shift;
-
- my $method;
- if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
- || ( $conf->exists('hidecancelledpackages')
- && ! $cgi->param('showcancelledpackages') )
- )
- {
- $method = 'ncancelled_pkgs';
+
+my $hide_cancelled = 0;
+if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
+ || ( $conf->exists('hidecancelledpackages')
+ && ! $cgi->param('showcancelledpackages') )
+ )
+{
+ $hide_cancelled = 1;
+}
+
+my $cust_pkg_fields =
+ join(', ', map { "cust_pkg.$_ AS $_" } fields('cust_pkg') );
+
+my $part_pkg_fields =
+ join(', ', ( map { "part_pkg.$_ AS part_pkg_$_" } fields('part_pkg') ),
+ 'setup_option.optionvalue AS part_pkg__setup_fee',
+ 'recur_option.optionvalue AS part_pkg__recur_fee',
+ );
+
+my $group_by =
+ join(', ', map "cust_pkg.$_", fields('cust_pkg') ). ', '.
+ join(', ', map "part_pkg.$_", fields('part_pkg') );
+
+my $num_svcs = '( SELECT COUNT(*) FROM cust_svc '.
+ ' WHERE cust_svc.pkgnum = cust_pkg.pkgnum ) AS num_svcs';
+
+my $addl_from = '
+ LEFT JOIN part_pkg USING ( pkgpart )
+ LEFT JOIN cust_pkg AS chgto ON ( chgto.change_to_pkgnum = cust_pkg.pkgnum )
+ LEFT JOIN cust_pkg AS chgfrom ON ( chgfrom.change_pkgnum = cust_pkg.pkgnum )
+';
+
+my $extra_sql =
+ ' AND cust_pkg.main_pkgnum IS NULL '. # supplemental package of something else
+ ' AND chgto.pkgnum IS NULL '. # ordered, not-yet-active change target
+ ' AND chgfrom.pkgnum IS NULL '; # canceled package changed into another
+
+unless ( $cgi->param('showoldpackages') ) {
+ my $years = $conf->config('cust_main-packages-years') || 2;
+ my $then = time - $years * 31556926; #60*60*24*365.2422 is close enough
+
+ $extra_sql .= " AND (
+ ( part_pkg.freq = '0'
+ AND ( cust_pkg.setup IS NULL OR cust_pkg.setup > $then )
+ )
+ OR ( part_pkg.freq != '0'
+ AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel > $then )
+ )
+ OR EXISTS ( SELECT 1 FROM cust_svc WHERE cust_svc.pkgnum = cust_pkg.pkgnum )
+ )";
+}
+
+if ( $cgi->param('classnum') =~ /^(\d+)$/ ) {
+ my $classnum = $1;
+ if ( $classnum == 0 ) {
+ $extra_sql .= " AND part_pkg.classnum IS NULL ";
} else {
- $method = 'all_pkgs';
+ $extra_sql .= " AND part_pkg.classnum = $classnum ";
+ }
+}
+
+if ( $cgi->param('status') =~ /^([\w ]+)$/ ) {
+ my $status = $1;
+ $extra_sql .= ' AND '. FS::cust_pkg->status_sql. " = '$status' ";
+}
+
+if ( $cgi->param('locationnum') =~ /^(\d+)$/ ) {
+ my $locationnum = $1;
+ $extra_sql .= " AND cust_pkg.locationnum = $locationnum ";
+}
+
+my $total_pkgs = $cust_main->all_pkgs;
+
+my $method = $hide_cancelled ? 'ncancelled_pkgs' : 'all_pkgs';
+my $num_pkgs = $cust_main->$method({
+ 'addl_from' => $addl_from,
+ 'extra_sql' => $extra_sql,
+});
+
+my $maxrecords = $conf->config('cust_main-packages-num_per_page') || 10;
+my $offset = $cgi->param('offset') =~ /^(\d+)$/ ? $1 : 0;
+$cgi->delete('offset');
+
+my @packages = $cust_main->$method( {
+ 'select' => "$cust_pkg_fields, $part_pkg_fields, $num_svcs",
+ 'addl_from' => $addl_from. "
+ LEFT JOIN part_pkg_option AS setup_option
+ ON ( cust_pkg.pkgpart = setup_option.pkgpart
+ AND setup_option.optionname = 'setup_fee' )
+ LEFT JOIN part_pkg_option AS recur_option
+ ON ( cust_pkg.pkgpart = recur_option.pkgpart
+ AND recur_option.optionname = 'recur_fee' )
+ ",
+ 'extra_sql' => $extra_sql,
+ 'order_by' => "ORDER BY pkgnum ASC LIMIT $maxrecords OFFSET $offset",
+} );
+
+foreach my $cust_pkg ( @packages ) {
+
+ my %hash = $cust_pkg->hash;
+ my %part_pkg = map { /^part_pkg_(.+)$/ or die; ( $1 => $hash{$_} ); }
+ grep { /^part_pkg_/ } keys %hash;
+ $cust_pkg->{'_pkgpart'} = new FS::part_pkg \%part_pkg;
+
+ #arrayref of supplementals
+ $cust_pkg->set('_supplemental', [
+ qsearch('cust_pkg', { main_pkgnum=>$cust_pkg->pkgnum })
+ ] );
+
+ #for future changes
+ if ( $cust_pkg->change_to_pkgnum ) {
+ my $change_to =
+ qsearchs('cust_pkg', { pkgnum=>$cust_pkg->change_to_pkgnum });
+ $cust_pkg->set('change_to_pkg', $change_to);
+ $change_to->set('change_from_pkg', $cust_pkg);
}
- my $cust_pkg_fields =
- join(', ', map { "cust_pkg.$_ AS $_" } fields('cust_pkg') );
+ #for past changes
+ setfrom($cust_pkg);
- my $part_pkg_fields =
- join(', ', map { "part_pkg.$_ AS part_pkg_$_" } fields('part_pkg') );
+ $cust_pkg->{'_cust_pkg_discount_active'} =
+ [ $cust_pkg->cust_pkg_discount_active ];
- my $group_by =
- join(', ', map "cust_pkg.$_", fields('cust_pkg') ). ', '.
- join(', ', map "part_pkg.$_", fields('part_pkg') );
+}
- my $num_svcs = '( SELECT COUNT(*) FROM cust_svc '.
- ' WHERE cust_svc.pkgnum = cust_pkg.pkgnum ) AS num_svcs';
+sub setfrom {
+ my $cust_pkg = shift;
- my @packages = $cust_main->$method( {
- 'select' => "$cust_pkg_fields, $part_pkg_fields, $num_svcs",
- 'addl_from' => 'LEFT JOIN part_pkg USING ( pkgpart )',
- } );
- my $num_old_packages = scalar(@packages);
+ if ( $cust_pkg->change_pkgnum ) {
+ my $changed_from =
+ qsearchs('cust_pkg', { pkgnum=>$cust_pkg->change_pkgnum });
+ $cust_pkg->set('changed_from_pkg', $changed_from);
+ $changed_from->set('changed_to_pkg', $cust_pkg);
- foreach my $cust_pkg ( @packages ) {
- my %hash = $cust_pkg->hash;
- my %part_pkg = map { /^part_pkg_(.+)$/ or die; ( $1 => $hash{$_} ); }
- grep { /^part_pkg_/ } keys %hash;
- $cust_pkg->{'_pkgpart'} = new FS::part_pkg \%part_pkg;
- }
+ setfrom($changed_from);
- unless ( $cgi->param('showoldpackages') ) {
- my $years = $conf->config('cust_main-packages-years') || 2;
- my $then = time - $years * 31556926; #60*60*24*365.2422 is close enough
-
- my %hide = ( 'cancelled' => 'cancel',
- 'one-time charge' => 'setup',
- );
-
- @packages =
- grep { !exists($hide{$_->status}) or $_->get($hide{$_->status}) > $then
- or $_->num_svcs #don't hide packages w/services
- }
- @packages;
}
- $num_old_packages -= scalar(@packages);
-
- # don't include supplemental packages in this list; they'll be found from
- # their main packages
- @packages = grep !$_->main_pkgnum, @packages;
-
- ( \@packages, $num_old_packages );
}
%init>