if ( el ) el.scrollIntoView(true);
</&>
</SCRIPT>
-% 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++ ? ' | ' : '' %>
- <A HREF="<% $p %>edit/cust_pkg.cgi?<% $cust_main->custnum %>"><% mt('Bulk order and cancel packages') |h %></A>
-% }
-
-<BR><BR>
-
-% } # unless $opt{no_links}
-
<TABLE>
<TR>
<TD ALIGN="left" VALIGN="top">
</TD>
-% unless ( $opt{no_links} ) {
-
- <TD ALIGN="right">
- <A HREF="<%$p%>search/report_cust_pkg.html?custnum=<% $cust_main->custnum %>"><% mt('Package reports') |h %></A>
-% if ( $curuser->access_right('Qualify service') ) {
- | <A HREF="<%$p%>search/qual.cgi?custnum=<% $cust_main->custnum %>"><% mt('View Qualifications') |h %></A>
-% }
- <BR>
- <% mt('Service reports:') |h %>
- <A HREF="<%$p%>search/report_svc_acct.html?custnum=<% $cust_main->custnum %>"><% mt('accounts') |h %></A><BR>
- <% mt('Usage reports:') |h %>
- <A HREF="<%$p%>search/report_cdr.html?custnum=<% $cust_main->custnum %>"><% mt('CDRs') |h %></A>
- </TD>
-
-% } # unless $opt{no_links}
-
</TR>
<TR>
<TD COLSPAN=2>
-% 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,
- &>
-</TABLE>
-% }
+
+% $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 &>
+ </TABLE>
+% }
+
</TD>
</TR>
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')
join(', ', map { "cust_pkg.$_ AS $_" } fields('cust_pkg') );
my $part_pkg_fields =
- join(', ', map { "part_pkg.$_ AS part_pkg_$_" } fields('part_pkg') );
+ 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') ). ', '.
# 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' => 'LEFT JOIN part_pkg USING ( pkgpart )',
+ '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 $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;
$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;
}
# 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'} =
projects / freeside.git / blobdiff