[freeside-commits] branch FREESIDE_3_BRANCH updated. e3efeaeaa661d78fcbf0a257b929db15f7892495
Mark Wells
mark at 420.am
Fri Oct 31 17:08:27 PDT 2014
The branch, FREESIDE_3_BRANCH has been updated
via e3efeaeaa661d78fcbf0a257b929db15f7892495 (commit)
from 3910789250b55b908956b6d7d712d007bf107c22 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e3efeaeaa661d78fcbf0a257b929db15f7892495
Author: Mark Wells <mark at freeside.biz>
Date: Fri Oct 31 17:08:18 2014 -0700
always collapse display of changed packages, #27305
diff --git a/httemplate/pref/pref-process.html b/httemplate/pref/pref-process.html
index 53cf7ef..0d1a45a 100644
--- a/httemplate/pref/pref-process.html
+++ b/httemplate/pref/pref-process.html
@@ -58,7 +58,6 @@ 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 3508907..832df78 100644
--- a/httemplate/pref/pref.html
+++ b/httemplate/pref/pref.html
@@ -76,22 +76,6 @@ Interface
</TD>
</TR>
- <TR>
- <TH ALIGN="right">Hide package changes: </TH>
- <TD COLSPAN=2>
- <& /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')),
- &>
- </TD>
- </TR>
-
% my $history_order = $curuser->option('history_order') || 'oldest';
<TR>
<TH ALIGN="right">Customer history sort order: </TH>
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 32a725d..228b04e 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -201,8 +201,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')
@@ -262,29 +260,26 @@ foreach my $cust_pkg ( @packages ) {
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};
- 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;
}
diff --git a/httemplate/view/cust_main/packages/hidden.html b/httemplate/view/cust_main/packages/hidden.html
index 35eda8c..9efe3fc 100644
--- a/httemplate/view/cust_main/packages/hidden.html
+++ b/httemplate/view/cust_main/packages/hidden.html
@@ -9,22 +9,28 @@
</TD>
<TD>
% if ( $pkgpart_change and $location_change ) {
- Package type and location change
+ <% emt('Package type and location change') %>
% } elsif ( $pkgpart_change ) {
- Package type change
+ <% emt('Package type change') %>
% } elsif ( $location_change ) {
- Location change
-% } # or else what?
+ <% emt('Location change') %>
+% } else { # in case the package was somehow replaced with itself
+ <% emt('Other package change') %>
+% }
<B><% time2str('%b %o, %Y', $cust_pkg->get('cancel')) %></B>
</TD><TD>
% if ( $pkgpart_change ) {
- from <% $popup_link |n %><B><% $part_pkg->pkg |h %></B> - <% $part_pkg->custom_comment |h %></A>
+ <% emt('from') %> <% $popup_link |n %><B><% $part_pkg->pkg |h %></B> - <% $part_pkg->custom_comment |h %></A>
% }
% if ( $pkgpart_change and $location_change ) {
<BR>
% }
% if ( $location_change ) {
- from <I><% $popup_link |n %><% $cust_pkg->location_label %></A></I>
+ <% emt('from') %> <I><% $popup_link |n %><% $cust_pkg->location_label %></A></I>
+% }
+% if ( !$pkgpart_change and !$location_change ) {
+% # have to show _something_
+ <% $popup_link |n %><% emt('Details') %></A>
% }
</TD>
</TR>
-----------------------------------------------------------------------
Summary of changes:
httemplate/pref/pref-process.html | 1 -
httemplate/pref/pref.html | 16 ----------------
httemplate/view/cust_main/packages.html | 23 +++++++++--------------
httemplate/view/cust_main/packages/hidden.html | 18 ++++++++++++------
4 files changed, 21 insertions(+), 37 deletions(-)
More information about the freeside-commits
mailing list