From 04220e7ef18314883ad1cec05c552f13d8d5f7e4 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Wed, 19 Feb 2014 14:08:06 -0800 Subject: [PATCH] collapse display of location-changed packages, #25130 --- httemplate/pref/pref-process.html | 1 + httemplate/pref/pref.html | 16 ++ httemplate/view/cust_main/packages.html | 232 +++++++++++++++--------- httemplate/view/cust_main/packages/hidden.html | 55 ++++++ httemplate/view/cust_main/packages/section.html | 19 ++ 5 files changed, 239 insertions(+), 84 deletions(-) create mode 100644 httemplate/view/cust_main/packages/hidden.html diff --git a/httemplate/pref/pref-process.html b/httemplate/pref/pref-process.html index 7848b72cb..6d4f89a77 100644 --- a/httemplate/pref/pref-process.html +++ b/httemplate/pref/pref-process.html @@ -59,6 +59,7 @@ unless ( $error ) { # if ($access_user) { snom-ip snom-username snom-password vonage-fromnumber vonage-username vonage-password cust_pkg-display_times + hide_package_changes show_pkgnum show_confitem_counts export_getsettings show_db_profile save_db_profile save_tmp_typesetting height width availHeight availWidth colorDepth diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html index ccfeecd77..eaa7d3281 100644 --- a/httemplate/pref/pref.html +++ b/httemplate/pref/pref.html @@ -78,6 +78,22 @@ Interface + + Hide package changes: + + <& /elements/select.html, + field => 'hide_package_changes', + options => [ '', 'location', 'all' ], + labels => { '' => 'never', + 'location' => 'location changes', + 'all' => 'all package changes', + }, + curr_value => ($cgi->param('hide_package_changes') + || $curuser->option('hide_package_changes')), + &> + + + % my $history_order = $curuser->option('history_order') || 'oldest'; Customer history sort order: diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index 566ab2943..746e0c7c5 100755 --- a/httemplate/view/cust_main/packages.html +++ b/httemplate/view/cust_main/packages.html @@ -22,8 +22,62 @@ table.usage { .row0 { background-color: #eeeeee; } .row1 { background-color: #ffffff; } - +table.hiddenrows { + width: 80%; + margin-left: 100px; + border: 1px solid #7E0079; + background-color: #cccccc; +} + +.hiddenrows td { + text-align: center; +} +.rolldown_button { + min-width: 80px; + margin-left: 100px; + min-height: 20px; + background-color: #efefef; + border: 1px solid #7e0079; + z-index: 1; + text-align: center; +} + +% # activate rolldown buttons for hidden package blocks + % unless ( $opt{no_links} ) { % my $s = 0; @@ -124,7 +178,7 @@ table.usage { % if ( $conf->exists('cust_pkg-group_by_location') ) { <& locations.html, 'cust_main' => $cust_main, - 'packages' => $packages, + 'packages' => \@packages, %opt, &> % } @@ -133,7 +187,7 @@ table.usage { <& /elements/table-grid.html &> <& packages/section.html, 'cust_main' => $cust_main, - 'packages' => $packages, + 'packages' => \@packages, %opt, &> @@ -141,15 +195,6 @@ table.usage { -% if ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) { - -% } <%init> @@ -159,94 +204,113 @@ 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'; - } else { - $method = 'all_pkgs'; - } - my $cust_pkg_fields = - join(', ', map { "cust_pkg.$_ AS $_" } fields('cust_pkg') ); +my $hide_changed = $curuser->option('hide_package_changes'); - my $part_pkg_fields = - join(', ', map { "part_pkg.$_ AS part_pkg_$_" } fields('part_pkg') ); +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 $group_by = - join(', ', map "cust_pkg.$_", fields('cust_pkg') ). ', '. - join(', ', map "part_pkg.$_", fields('part_pkg') ); +my $cust_pkg_fields = + join(', ', map { "cust_pkg.$_ AS $_" } fields('cust_pkg') ); - my $num_svcs = '( SELECT COUNT(*) FROM cust_svc '. - ' WHERE cust_svc.pkgnum = cust_pkg.pkgnum ) AS num_svcs'; +my $part_pkg_fields = + join(', ', map { "part_pkg.$_ AS part_pkg_$_" } fields('part_pkg') ); - 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); +my $group_by = + join(', ', map "cust_pkg.$_", fields('cust_pkg') ). ', '. + join(', ', map "part_pkg.$_", fields('part_pkg') ); - my %change_to_from; # target pkgnum => current cust_pkg, for future changes +my $num_svcs = '( SELECT COUNT(*) FROM cust_svc '. + ' WHERE cust_svc.pkgnum = cust_pkg.pkgnum ) AS num_svcs'; - 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; - } +# 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 )', +} ); + +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; + } +} - if ( keys %change_to_from ) { - my @not_future_packages; - foreach my $cust_pkg (@packages) { - if ( exists( $change_to_from{$cust_pkg->pkgnum} ) ) { - 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); - } else { - push @not_future_packages, $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 + 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; } + } else { + push @displayable_packages, $cust_pkg; } - @packages = @not_future_packages; } + @packages = @displayable_packages; +} - 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; - } +# 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); - $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; +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 - ( \@packages, $num_old_packages ); + 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 +# (as will change-target packages) +@packages = grep !$_->main_pkgnum, @packages; + diff --git a/httemplate/view/cust_main/packages/hidden.html b/httemplate/view/cust_main/packages/hidden.html new file mode 100644 index 000000000..e3bd0fabf --- /dev/null +++ b/httemplate/view/cust_main/packages/hidden.html @@ -0,0 +1,55 @@ +% if (!$iopt{noframe}) { +% # then start the block here, and assign a suitable ID (cust_pkgX_block) + +% } + + + + +% if ( $cust_pkg->get('changed_from_pkg') ) { +<& hidden.html, $cust_pkg->get('changed_from_pkg'), + %iopt, + 'next_pkg' => $cust_pkg, + 'noframe' => 1 +&> +% } +% if ( !$iopt{noframe} ) { + +% } +<%init> +my $cust_pkg = shift; +my $part_pkg = $cust_pkg->part_pkg; +my %iopt = @_; +my $next = delete($iopt{'next_pkg'}); +my $curuser = $FS::CurrentUser::CurrentUser; +my $pkgnum = $curuser->option('show_pkgnum') ? $cust_pkg->pkgnum.': ' : ''; + +my $id = "cust_pkg".$cust_pkg->pkgnum; + +my $pkgpart_change = ($next->pkgpart != $cust_pkg->pkgpart); +my $location_change = ($next->locationnum != $cust_pkg->locationnum); +my $both_change = $pkgpart_change && $location_change; + + diff --git a/httemplate/view/cust_main/packages/section.html b/httemplate/view/cust_main/packages/section.html index 152ccaa5d..730bb2cf0 100755 --- a/httemplate/view/cust_main/packages/section.html +++ b/httemplate/view/cust_main/packages/section.html @@ -35,6 +35,25 @@ <& services.html, %iopt &> +% # insert hidden predecessors to this package, if any +% # and a rolldown button to show them +% # (we'll make it do something later) +% if ( $cust_pkg->get('changed_from_pkg') ) { + + + +% # the hidden block here has ID="cust_pkgX" where X is the first pkgnum +% # it contains. + <& hidden.html, $cust_pkg->get('changed_from_pkg'), + %iopt, + 'next_pkg' => $cust_pkg, + &> + + +% } % $row++; % # show the change target, if there is one % if ( $cust_pkg->change_to_pkg ) { -- 2.11.0