X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=0c67843d4e9328f25778ea4cf5fe23a8489aa688;hb=80c2d997c5c983344c530ecbb46f94f1c299b35f;hp=32a725df3dea77eb0f1da67af8e0802548d0f486;hpb=f9930edeaceb217a6503fa49078fcff2b588caf8;p=freeside.git
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 32a725df3..0c67843d4 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -42,6 +42,7 @@ table.hiddenrows {
z-index: 1;
text-align: center;
}
+
% # activate rolldown buttons for hidden package blocks
-% 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,
- &>
-
-% }
-
-% if ( $curuser->access_right('Bulk change customer packages') ) {
- <% $s++ ? ' | ' : '' %>
- <% mt('Bulk order and cancel packages') |h %>
-% }
-
-
-
-% } # unless $opt{no_links}
-
@@ -155,22 +112,6 @@ if ( el ) el.scrollIntoView(true);
|
-% 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}
-
@@ -201,8 +142,6 @@ my $curuser = $FS::CurrentUser::CurrentUser;
my $countrydefault = scalar($conf->config('countrydefault')) || 'US';
-my $hide_changed = $curuser->option('hide_package_changes');
-
my $hide_cancelled = 0;
if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
|| ( $conf->exists('hidecancelledpackages')
@@ -242,8 +181,11 @@ my @packages = $cust_main->all_pkgs( {
},
} );
+my $is_anything_hidden = 0; # optimization
+
my %change_to_from; # target pkgnum => current cust_pkg, for future changes
my %changed_from; # old pkgnum => new cust_pkg, for past changes
+my %supplementals_of; # main pkgnum => arrayref of supplementals
foreach my $cust_pkg ( @packages ) {
my %hash = $cust_pkg->hash;
@@ -252,39 +194,53 @@ foreach my $cust_pkg ( @packages ) {
$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;
+ $is_anything_hidden = 1;
}
if ( $cust_pkg->change_pkgnum ) {
$changed_from{$cust_pkg->change_pkgnum} = $cust_pkg;
+ $is_anything_hidden = 1;
+ }
+ if ( $cust_pkg->main_pkgnum ) {
+ $supplementals_of{$cust_pkg->main_pkgnum} ||= [];
+ push @{ $supplementals_of{$cust_pkg->main_pkgnum} }, $cust_pkg;
+ $is_anything_hidden = 1;
}
}
# filter out hidden package changes
-if ( keys %change_to_from or keys %changed_from ) {
+if ( $is_anything_hidden ) {
my @displayable_packages;
foreach my $cust_pkg (@packages) {
- if ( exists( $change_to_from{$cust_pkg->pkgnum} ) ) {
+
+ # if this package has any supplemental packages, it should remember them
+ $cust_pkg->set('_supplemental', $supplementals_of{$cust_pkg->pkgnum});
+
+ if ( $cust_pkg->main_pkgnum ) {
+
+ # it's a supplemental package of something else, and shouldn't be on the
+ # root list
+
+ } elsif ( 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};
- if ( ( $hide_changed eq 'all' ) or
- ( $hide_changed eq 'location'
- and $changed_to->pkgpart == $cust_pkg->pkgpart
- and $changed_to->refnum == $cust_pkg->refnum
- and $changed_to->quantity == $cust_pkg->quantity )
- ) {
- # then we're hiding it
- $cust_pkg->set('changed_to_pkg', $changed_to);
- $changed_to->set('changed_from_pkg', $cust_pkg);
- } else { # show it anyway
- push @displayable_packages, $cust_pkg;
- }
+ $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;
}
@@ -317,7 +273,7 @@ $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;
+####@packages = grep !$_->main_pkgnum, @packages;
foreach my $cust_pkg ( @packages ) {
$cust_pkg->{'_cust_pkg_discount_active'} =