X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=4903e185b3f0c4af33cf97b1c0363cf5b93206a4;hb=98f6d91ec7eaa907204afbfeb90ede1e3bff656d;hp=093cbfae6aec552ad8fd351fd13161d83bd23873;hpb=2d87f8d18a809c672fbd4d05dacf04efd9bbe621;p=freeside.git diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index 093cbfae6..4903e185b 100755 --- a/httemplate/view/cust_main/packages.html +++ b/httemplate/view/cust_main/packages.html @@ -1,38 +1,87 @@ -Packages
- -% my $s = 0; -% if ( $curuser->access_right('Order customer package') ) { - <% $s++ ? ' | ' : '' %> - <% order_pkg_link($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' => 545, - }) - %> - -% } -% if ( $curuser->access_right('Bulk change customer packages') ) { - <% $s++ ? ' | ' : '' %> - Bulk order and cancel packages (preserves services) -% } + +% # activate rolldown buttons for hidden package blocks + + + + - - - - - -%foreach my $cust_pkg (@$packages) { -% -% my $part_pkg = $cust_pkg->part_pkg; -% -% if ( $bgcolor eq $bgcolor1 ) { -% $bgcolor = $bgcolor2; -% } else { -% $bgcolor = $bgcolor1; -% } - - - - - - - - - - -% } #end display packages -% +% $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 &> +
-Current packages -% } % if ( $cust_main->num_cancelled_pkgs ) { % if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me % || ( $conf->exists('hidecancelledpackages') @@ -40,594 +89,194 @@ 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 -% } - - cancelled packages ) -% } -% if ( @$packages ) { - - -<% include('/elements/table-grid.html') %> -% my $bgcolor1 = '#eeeeee'; -% my $bgcolor2 = '#ffffff'; -% my $bgcolor = ''; - -
PackageStatusServices
- - <% $cust_pkg->pkgnum %>: - <% $part_pkg->pkg %> - <% $part_pkg->comment %> -
- -% if ( $cust_pkg->quantity > 1 ) { -       Quantity: <% $cust_pkg->quantity %>
-% } - - -% unless ( $cust_pkg->get('cancel') ) { -% my $br = 0; -% if ( $curuser->access_right('Change customer package') ) { $br=1; - - ( <%pkg_change_link($cust_pkg)%> ) -% } -% if ( $curuser->access_right('Edit customer package dates') ) { $br=1; - - ( <%pkg_dates_link($cust_pkg)%> ) + ( <% mt('hide') |h %> +% $cgi->param('showcancelledpackages', 1); % } -% if ( $curuser->access_right('Customize customer package') ) { $br=1; - ( <%pkg_customize_link($cust_pkg,$cust_main->custnum)%> ) -% } - <% $br ? '
' : '' %> + <% mt('cancelled packages') |h %>
) % } - -% if ( $cust_pkg->num_cust_event -% && ( $curuser->access_right('Billing event reports') -% || $curuser->access_right('View customer billing events') -% ) -% ) { - ( <%pkg_event_link($cust_pkg)%> ) +% 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 %> ) % } -
- -
- -% -% sub myfreq { -% my $part_pkg = shift; -% my $freq = $part_pkg->freq_pretty; -% $freq =~ s/ / /g; -% $freq; -% } -% -% #this should use cust_pkg->status and cust_pkg->statuscolor eventually -% #my $colspan = $conf->exists('cust_pkg-display_times') ? 8 : 4; -% #my $width = $conf->exists('cust_pkg-display_times') ? '38%' : '56%'; -% -% #false laziness w/edit/REAL_cust_pkg.cgi -% my( $billed_or_prepaid, $last_bill_or_renewed, $next_bill_or_prepaid_until ); -% unless ( $part_pkg->is_prepaid ) { -% $billed_or_prepaid = 'billed'; -% $last_bill_or_renewed = 'Last bill'; -% $next_bill_or_prepaid_until = 'Next bill'; -% } else { -% $billed_or_prepaid = 'prepaid'; -% $last_bill_or_renewed = 'Renewed'; -% $next_bill_or_prepaid_until = 'Prepaid until'; -% } -% -% -% if ( $cust_pkg->get('cancel') ) { #status: cancelled -% my $cpr = $cust_pkg->last_cust_pkg_reason; - - <% pkg_status_row($cust_pkg, 'Cancelled', 'cancel', 'color'=>'FF0000', conf=>$conf ) %> - - <% pkg_status_row_colspan( - ( ( $cpr && ( $cpr->date == $cust_pkg->get('cancel') || - $cpr->date == $cust_pkg->expire - ) - ) ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '', - 'align' => 'right', 'color' => 'ff0000', 'size' => '-2', - ) - %> - -% unless ( $cust_pkg->get('setup') ) { - - <% pkg_status_row_colspan('Never billed') %> - -% } else { - - <% pkg_status_row( $cust_pkg, 'Setup', 'setup', conf=>$conf ) %> - <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %> - <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf ) %> - <% pkg_status_row_if( $cust_pkg, 'Suspended', 'susp', conf=>$conf ) %> - -% } -% -% } else { -% -% if ( $cust_pkg->get('susp') ) { #status: suspended -% my $cpr = $cust_pkg->last_cust_pkg_reason; - - <% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900', conf=>$conf ) %> - - <% pkg_status_row_colspan( - ( ( $cpr && ( $cpr->date == $cust_pkg->susp || - $cpr->date == $cust_pkg->adjourn - ) - ) ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '', - 'align' => 'right', 'color' => 'FF9900', 'size' => '-2', - ) - %> - -% unless ( $cust_pkg->get('setup') ) { - <% pkg_status_row_colspan('Never billed') %> -% } else { - <% pkg_status_row($cust_pkg, 'Setup', 'setup', conf=>$conf ) %> -% } - - <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %> - <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf ) %> -% # pkg_status_row($cust_pkg, 'Next bill', 'bill', conf=>$conf) - <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', conf=>$conf ) %> - - - - - -% } else { #status: active -% -% unless ( $cust_pkg->get('setup') ) { #not setup -% -% unless ( $part_pkg->freq ) { - - <% pkg_status_row_colspan('Not yet billed (one-time charge)') %> - - - - - -% } else { - - <% pkg_status_row_colspan("Not yet billed ($billed_or_prepaid ". myfreq($part_pkg). ')' ) %> - -% } -% -% } else { #setup -% -% unless ( $part_pkg->freq ) { - - <% pkg_status_row_colspan('One-time charge') %> - - <% pkg_status_row($cust_pkg, 'Billed', 'setup', conf=>$conf) %> - -% } else { -% -% if (scalar($cust_pkg->overlimit)) { - - <% pkg_status_row_colspan( - 'Overlimit', - $billed_or_prepaid. ' '. myfreq($part_pkg), - 'color' => 'FFD000', - ) - %> - -% } else { - <% pkg_status_row_colspan( - 'Active', - $billed_or_prepaid. ' '. myfreq($part_pkg), - 'color' => '00CC00', - ) - %> -% } - - <% pkg_status_row($cust_pkg, 'Setup', 'setup', conf=>$conf) %> - -% } -% -% } - - <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %> - <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf ) %> - <% pkg_status_row_if( $cust_pkg, $next_bill_or_prepaid_until, 'bill', conf=>$conf ) %> - <% pkg_status_row_if( $cust_pkg, 'Will suspend on', 'adjourn', conf=>$conf ) %> - <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', conf=>$conf ) %> - -% if ( $part_pkg->freq ) { - - - - -% } -% -% } -% } - -
> - -% if ( $curuser->access_right('Unsuspend customer package') ) { - ( <% pkg_unsuspend_link($cust_pkg) %> ) -% } -% if ( $curuser->access_right('Cancel customer package immediately') ) { - ( <% pkg_cancel_link($cust_pkg) %> ) -% } - -
> - -% if ( $curuser->access_right('Cancel customer package immediately') ) { - ( <% pkg_cancel_link($cust_pkg) %> ) -% } - -
> - -% if ( $curuser->access_right('Suspend customer package') ) { - ( <% pkg_suspend_link($cust_pkg) %> ) -% } -% if ( $curuser->access_right('Suspend customer package later') ) { - ( <% pkg_adjourn_link($cust_pkg) %> ) -% } -% if ( $curuser->access_right('Cancel customer package immediately') ) { - ( <% pkg_cancel_link($cust_pkg) %> ) -% } -% if ( $curuser->access_right('Cancel customer package later') ) { - ( <% pkg_expire_link($cust_pkg) %> ) -% } - - -
-
- - -% #foreach my $svcpart (sort {$a->{svcpart} <=> $b->{svcpart}} @{$pkg->{svcparts}}) { -% foreach my $part_svc ( $cust_pkg->part_svc ) { - -% #foreach my $service (@{$svcpart->{services}}) { -% foreach my $cust_svc ( @{ $part_svc->cust_pkg_svc } ) { - - - - - - - - - - - - - - - - -% } + -% if ( ! $cust_pkg->get('cancel') -% && $curuser->access_right('Provision customer service') -% && $part_svc->num_avail -% ) { + - - - + +
<% FS::UI::Web::svc_link($m, $part_svc, $cust_svc) %><% FS::UI::Web::svc_label_link($m, $part_svc, $cust_svc) %><% FS::UI::Web::svc_export_links($m, $part_svc, $cust_svc) %>
- - <% $cust_svc->overlimit ? "Overlimit: ". time2str('%b %o %Y' . ($conf->exists('cust_pkg-display_times') ? ' %l:%M %P' : ''), $cust_svc->overlimit) : '' %> -
- -% if ( $curuser->access_right('Recharge customer service') -% && $part_svc->svcdb eq 'svc_acct' -% && ( $cust_svc->svc_x->seconds ne '' -% || $cust_svc->svc_x->upbytes ne '' -% || $cust_svc->svc_x->downbytes ne '' -% || $cust_svc->svc_x->totalbytes ne '' -% ) -% ) { - ( <%svc_recharge_link($cust_svc)%> ) -% } - - -% if ( $curuser->access_right('Unprovision customer service') ) { - ( <%svc_unprovision_link($cust_svc)%> ) -% } -
- <% svc_provision_link($cust_pkg, $part_svc, $conf, $curuser) %> -
-% } - -% } - -
-
+% } + + -% } 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 $countrydefault = scalar($conf->config('countrydefault')) || 'US'; -my $colspan = $conf->exists('cust_pkg-display_times') ? 8 : 4; -my $width = $conf->exists('cust_pkg-display_times') ? '38%' : '56%'; +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; +} -sub pkg_status_row { - my( $cust_pkg, $title, $field, %opt ) = @_; +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 $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; + 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; + $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; + } +} - my $color = $opt{'color'}; +# filter out hidden package changes +if ( $is_anything_hidden ) { + my @displayable_packages; + foreach my $cust_pkg (@packages) { - my $html = qq(); - $html .= qq() if length($color); - $html .= qq($title ); - $html .= qq() if length($color); - $html .= qq(); - $html .= pkg_datestr($cust_pkg, $field, $opt{conf}).''; + # if this package has any supplemental packages, it should remember them + $cust_pkg->set('_supplemental', $supplementals_of{$cust_pkg->pkgnum}); - $html; -} + if ( $cust_pkg->main_pkgnum ) { -sub pkg_status_row_if { - my( $cust_pkg, $title, $field, %opt ) = @_; - $cust_pkg->get($field) ? pkg_status_row(@_) : ''; -} + # it's a supplemental package of something else, and shouldn't be on the + # root list -sub pkg_status_row_changed { - my( $cust_pkg, %opt ) = @_; - return '' unless $cust_pkg->change_date; - my $html = pkg_status_row( $cust_pkg, 'Package changed', 'change_date', conf=>$opt{'conf'} ); - my $old = $cust_pkg->old_cust_pkg; - if ( $old ) { - my $part_pkg = $old->part_pkg; - my $label = 'Changed from '. $cust_pkg->change_pkgnum. ': '. - $part_pkg->pkg. ' - '. $part_pkg->comment; - $html .= pkg_status_row_colspan( $label, '', size=>'-1', align=>'right' ); - } - $html; -} + } elsif ( exists( $change_to_from{$cust_pkg->pkgnum} ) ) { -sub pkg_status_row_colspan { - my($title, $addl, %opt) = @_; + # $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); - my $align = $opt{'align'} ? 'ALIGN="'. $opt{'align'}.'"' : ''; - my $color = $opt{'color'} ? 'COLOR="#'.$opt{'color'}.'"' : ''; - my $size = $opt{'size'} ? 'SIZE="'. $opt{'size'}. '"' : ''; + } elsif ( exists( $changed_from{$cust_pkg->pkgnum} ) ) { - my $html = qq(); - $html .= qq() if length($color) || $size; - $html .= qq() if $color && !$size; - $html .= $title; - $html .= qq() if $color && !$size; - $html .= qq() if length($color) || $size; - $html .= ", $addl" if length($addl); - $html .= qq(); + # $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); - $html; + } else { -} + push @displayable_packages, $cust_pkg; + + } -#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'; } + @packages = @displayable_packages; +} - [ $cust_main->$method() ]; +# filter all cancelled packages if the user wants +if ( $hide_cancelled ) { + @packages = grep { !$_->get('cancel') } @packages; } -sub svc_provision_link { - my ($cust_pkg, $part_svc, $conf, $curuser) = @_; - ( my $svc_nbsp = $part_svc->svc ) =~ s/\s+/ /g; - my $num_avail = $part_svc->num_avail; - my $pkgnum_svcpart = "pkgnum=". $cust_pkg->pkgnum. ';'. - "svcpart=". $part_svc->svcpart; - my $url; - if ( $part_svc->svcdb eq 'svc_external' #could be generalized - && $conf->exists('svc_external-skip_manual') - ) { - $url = "${p}edit/process/". $part_svc->svcdb. ".cgi?$pkgnum_svcpart"; - } else { - $url = svc_url( - 'm' => $m, - 'action' => 'edit', - 'part_svc' => $part_svc, - 'query' => $pkgnum_svcpart, - ); - #$url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart"; - } +# filter out 'old' packages +my $num_old_packages = scalar(@packages); - my $link = qq!!. - "Provision $svc_nbsp ($num_avail)"; - if ( $conf->exists('legacy_link') - && $curuser->access_right('View/link unlinked services') - ) - { - $link .= '
'. - qq!!. - "Link to legacy $svc_nbsp ($num_avail)"; - } - $link; -} +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 -sub svc_unprovision_link { - my $cust_svc = shift or return ''; - qq!Unprovision!; -} + my %hide = ( 'cancelled' => 'cancel', + 'one-time charge' => 'setup', + ); -sub pkg_datestr { - my($cust_pkg, $field, $conf) = @_ or return ''; - return ' ' unless $cust_pkg->get($field); - my $format = '%b'. - ' %o,'. - ' %Y'; - #$format .= ' %l:%M:%S%P %z' - $format .= ' %l'. - ':'. - '%M'. - ' %P' - if $conf->exists('cust_pkg-display_times'); - my $strip = time2str($format, $cust_pkg->get($field) ); - $strip =~ s/ (\d)/$1/g; - $strip; + @packages = + grep { !exists($hide{$_->status}) or $_->get($hide{$_->status}) > $then + or $_->num_svcs #don't hide packages w/services + } + @packages; } -sub pkg_change_link { include( '/elements/popup_link-cust_pkg.html', - { 'action' => $p. 'misc/change_pkg.cgi?dummy=value', - 'label' => 'Change package', - 'actionlabel' => 'Change', - 'cust_pkg' => shift, - } - ) - } - -sub pkg_suspend_link { include( '/elements/popup_link-cust_pkg.html', - { 'action' => $p. 'misc/cancel_pkg.html?method=suspend', - 'label' => 'Suspend now', - 'actionlabel' => 'Suspend', - 'color' => '#FF9900', - 'cust_pkg' => shift, - } - ) - } - - -sub pkg_adjourn_link { include( '/elements/popup_link-cust_pkg.html', - { 'action' => $p. 'misc/cancel_pkg.html?method=adjourn', - 'label' => 'Suspend later', - 'actionlabel' => 'Adjourn', - 'color' => '#CC6600', - 'cust_pkg' => shift, - } - ) - } - -sub pkg_unsuspend_link { pkg_link('misc/unsusp_pkg', 'Unsuspend', @_ ); } -sub pkg_dates_link { pkg_link('edit/REAL_cust_pkg', 'Edit dates', @_ ); } - -sub pkg_cancel_link { include( '/elements/popup_link-cust_pkg.html', - { 'action' => $p. 'misc/cancel_pkg.html?method=cancel', - 'label' => 'Cancel now', - 'actionlabel' => 'Cancel', - 'color' => '#ff0000', - 'cust_pkg' => shift, - } - ) - } - -sub pkg_expire_link { include( '/elements/popup_link-cust_pkg.html', - { 'action' => $p. 'misc/cancel_pkg.html?method=expire', - 'label' => 'Cancel later', - 'actionlabel' => 'Expire', #"Cancel package $num later" - 'color' => '#CC0000', - 'cust_pkg' => shift, - } - ) - } - -sub svc_recharge_link { include( '/elements/popup_link-cust_svc.html', - { 'action' => $p. 'misc/recharge_svc.html', - 'label' => 'Recharge', - 'actionlabel' => 'Recharge', - 'color' => '#333399', - 'cust_svc' => shift, - } - ) - } - -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', - } - ) - } - -sub pkg_event_link { - my($cust_pkg) = @_; - qq!!. - 'View package events'. - ''; -} +$num_old_packages -= scalar(@packages); -sub pkg_link { - my($action, $label, $cust_pkg) = @_; - return '' unless $cust_pkg; - qq!$label!; -} +# 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; -sub pkg_customize_link { - my $cust_pkg = shift or return ''; - my $custnum = $cust_pkg->custnum; - qq!Customize!; +foreach my $cust_pkg ( @packages ) { + $cust_pkg->{'_cust_pkg_discount_active'} = + [ $cust_pkg->cust_pkg_discount_active ]; }