X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=9a2332ba8501e47d4e772f726376fdf4ac3f55c4;hb=6f7c51547a8604f0fb8e6350aa6b1f4618c6833f;hp=5c0ee48affd841f6c88415955e1700932ec014aa;hpb=7d751137371d5e6e263265e7aa37433ad7f871c3;p=freeside.git
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 5c0ee48af..9a2332ba8 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -1,106 +1,131 @@
-Packages
+
+% # activate rolldown buttons for hidden package blocks
+% unless ( $opt{no_links} ) {
-function taxoverridequickchargemagic() {
- var str = document.getElementById('charge_storage').value;
- if (str.length){str += ';';}
- str += 'magic=taxoverride;tax_override=';
- str += document.getElementById('tax_override').value;
- cClick();
- overlib( OLiframeContent('<% $p %>/edit/quick-charge.html?'+str, 545, 336, 'One-time charge'), CAPTION, 'One-time charge', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', CLOSETEXT, 'Close');
+% my $s = 0;
-}
-
-
-
-% }
+% if ( $curuser->access_right('Qualify service') ) {
+ <% $s++ ? ' | ' : '' %>
+ <& qual_link.html, $cust_main &>
+% }
-% my $s = 0;
% if ( $curuser->access_right('Order customer package') ) {
<% $s++ ? ' | ' : '' %>
- <% order_pkg_link($cust_main) %>
+ <& /elements/order_pkg_link.html, 'cust_main'=>$cust_main &>
% }
% if ( $curuser->access_right('One-time charge')
% && $conf->config('payby-default') ne 'HIDE'
% ) {
-%
<% $s++ ? ' | ' : '' %>
- <% include('/elements/popup_link.html',
- {
- 'action' => $p. 'edit/quick-charge.html?custnum='. $cust_main->custnum,
- 'label' => 'One-time charge',
- 'actionlabel' => 'One-time charge',
- 'color' => '#333399',
- 'width' => 763,
- })
- %>
+ <& /elements/one_time_charge_link.html, 'custnum'=>$cust_main->custnum &>
% }
-% if ( $curuser->access_right('Bulk change customer packages') ) {
+% if ( $curuser->access_right('Bulk move customer services') ) {
<% $s++ ? ' | ' : '' %>
- Bulk order and cancel packages (preserves services)
+
+ <& /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,
+ &>
+
% }
+% if ( $curuser->access_right('Bulk change customer packages') ) {
+ <% $s++ ? ' | ' : '' %>
+ <% mt('Bulk order and cancel packages') |h %>
+% }
-% if ( @$packages ) {
-Current packages
-% }
+% } # unless $opt{no_links}
+
+
+
+
+
% if ( $cust_main->num_cancelled_pkgs ) {
% if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
% || ( $conf->exists('hidecancelledpackages')
@@ -108,133 +133,190 @@ Current packages
% )
% )
% {
+% my $prev = $cgi->param('showcancelledpackages');
% $cgi->param('showcancelledpackages', 1);
-%
-
- ( show
+ ( <% mt('show') |h %>
+% $cgi->param('showcancelledpackages', $prev);
% } else {
% $cgi->param('showcancelledpackages', 0);
-%
-
- ( hide
+ ( <% mt('hide') |h %>
+% $cgi->param('showcancelledpackages', 1);
% }
- cancelled packages )
+ <% mt('cancelled packages') |h %> )
% }
-% if ( @$packages ) {
-
-<% include('/elements/table-grid.html') %>
-% my $bgcolor1 = '#eeeeee';
-% my $bgcolor2 = '#ffffff';
-% my $bgcolor = '';
-
- |
- Package |
- Status |
-% if ( $show_location ) {
- Location |
+% if ( $num_old_packages ) {
+% $cgi->param('showoldpackages', 1);
+ ( <% mt('show old packages') |h %> )
+% } elsif ( $cgi->param('showoldpackages') ) {
+% $cgi->param('showoldpackages', 0);
+ ( <% mt('hide old packages') |h %> )
% }
- Services |
-
-% foreach my $cust_pkg (@$packages) {
-%
-% if ( $bgcolor eq $bgcolor1 ) {
-% $bgcolor = $bgcolor2;
-% } else {
-% $bgcolor = $bgcolor1;
-% }
-%
-% my $countrydefault = scalar($conf->config('countrydefault')) || 'US';
-% my %iopt = (
-% 'bgcolor' => $bgcolor,
-% 'cust_pkg' => $cust_pkg,
-% 'part_pkg' => $cust_pkg->part_pkg,
-%
-% #for services.html and status.html
-% 'cust_pkg-display_times' => $conf->exists('cust_pkg-display_times'),
-%
-% #for location.html
-% 'countrydefault' => $countrydefault,
-% 'statedefault' => ( scalar($conf->config('statedefault'))
-% || ($countrydefault eq 'US' ? 'CA' : '') ),
-%
-% #for services.html
-% 'svc_external-skip_manual' => $conf->exists('svc_external-skip_manual'),
-% 'legacy_link' => $conf->exists('legacy_link'),
-%
-% );
-
-
-
- <% include('packages/package.html', %iopt) %>
- <% include('packages/status.html', %iopt) %>
-% if ( $show_location ) {
- <% include('packages/location.html', %iopt) %>
-% }
- <% include('packages/services.html', %iopt) %>
-
+
+% 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 %>
+ |
+
+% } # 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 &>
+ |
+% }
+
+
+
-
-% } else {
-
-% }
-
-% if ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) {
-
-% }
<%init>
-my( $cust_main ) = @_;
+my $cust_main = shift;
+my %opt = @_;
my $conf = new FS::Conf;
my $curuser = $FS::CurrentUser::CurrentUser;
-my $packages = get_packages($cust_main, $conf);
-
-my $show_location = $conf->exists('cust_pkg-always_show_location')
- || ( grep $_->locationnum, @$packages ); # ? '1' : '0';
-
-#subroutines
-
-sub get_packages {
- my $cust_main = shift or return undef;
- my $conf = shift;
-
- my @packages = ();
- my $method;
- if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
- || ( $conf->exists('hidecancelledpackages')
- && ! $cgi->param('showcancelledpackages') )
- )
- {
- $method = 'ncancelled_pkgs';
- } else {
- $method = 'all_pkgs';
+my $countrydefault = scalar($conf->config('countrydefault')) || 'US';
+
+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';
+
+# don't exclude cancelled packages at this stage
+my @packages = $cust_main->all_pkgs( {
+ 'select' => "$cust_pkg_fields, $part_pkg_fields, $num_svcs",
+ 'addl_from' => qq{
+ LEFT JOIN part_pkg USING ( pkgpart )
+ 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' )
+ },
+} );
+
+my %change_to_from; # target pkgnum => current cust_pkg, for future changes
+my %changed_from; # old pkgnum => new cust_pkg, for past changes
+
+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;
+ if ( $cust_pkg->change_to_pkgnum ) {
+ $change_to_from{$cust_pkg->change_to_pkgnum} = $cust_pkg;
+ }
+ if ( $cust_pkg->change_pkgnum ) {
+ $changed_from{$cust_pkg->change_pkgnum} = $cust_pkg;
+ }
+}
+
+# filter out hidden package changes
+if ( keys %change_to_from or keys %changed_from ) {
+ my @displayable_packages;
+ foreach my $cust_pkg (@packages) {
+
+ if ( exists( $change_to_from{$cust_pkg->pkgnum} ) ) {
+
+ # $cust_pkg is an ordered, not-yet-active package change target
+ my $change_from = $change_to_from{ $cust_pkg->pkgnum };
+ $cust_pkg->set('change_from_pkg', $change_from);
+ $change_from->set('change_to_pkg', $cust_pkg);
+
+ } elsif ( exists( $changed_from{$cust_pkg->pkgnum} ) ) {
+
+ # $cust_pkg is a canceled package changed into another packge
+ # hide it under the destination package's history
+ my $changed_to = $changed_from{$cust_pkg->pkgnum};
+ $cust_pkg->set('changed_to_pkg', $changed_to);
+ $changed_to->set('changed_from_pkg', $cust_pkg);
+
+ } else {
+ push @displayable_packages, $cust_pkg;
+ }
+
}
+ @packages = @displayable_packages;
+}
+
+# filter all cancelled packages if the user wants
+if ( $hide_cancelled ) {
+ @packages = grep { !$_->get('cancel') } @packages;
+}
+
+# filter out 'old' packages
+my $num_old_packages = scalar(@packages);
- [ $cust_main->$method() ];
+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;
}
-sub order_pkg_link {
- include( '/elements/popup_link-cust_main.html',
- 'action' => $p. 'misc/order_pkg.html',
- 'label' => 'Order new package',
- 'actionlabel' => 'Order new package',
- 'color' => '#333399',
- 'cust_main' => shift,
- 'closetext' => 'Close',
- 'width' => 763,
- )
+$num_old_packages -= scalar(@packages);
+
+# don't include supplemental packages in this list; they'll be found from
+# their main packages
+# (as will change-target packages)
+@packages = grep !$_->main_pkgnum, @packages;
+
+foreach my $cust_pkg ( @packages ) {
+ $cust_pkg->{'_cust_pkg_discount_active'} =
+ [ $cust_pkg->cust_pkg_discount_active ];
}
%init>