X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=f3cfc06f405a1a5019d78b3bed3bf93b051c190c;hb=a21dee1f18ad9ac220efe66a0c044aa262a12c99;hp=32a725df3dea77eb0f1da67af8e0802548d0f486;hpb=8171fd8de079cdfb23eb2b0dcc297e0e670b6e4e;p=freeside.git
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 32a725df3..f3cfc06f4 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -96,7 +96,7 @@ if ( el ) el.scrollIntoView(true);
% && $conf->config('payby-default') ne 'HIDE'
% ) {
<% $s++ ? ' | ' : '' %>
- <& one_time_charge_link.html, $cust_main &>
+ <& /elements/one_time_charge_link.html, 'custnum'=>$cust_main->custnum &>
% }
% if ( $curuser->access_right('Bulk move customer services') ) {
@@ -167,6 +167,17 @@ if ( el ) el.scrollIntoView(true);
<% mt('accounts') |h %>
<% mt('Usage reports:') |h %>
<% mt('CDRs') |h %>
+% if ( $curuser->access_right('Usage: RADIUS sessions') ) {
+ |
+ <& /elements/popup_link-cust_main.html,
+ 'label' => emt('Data usage'),
+ 'action' => "${p}search/report_sqlradius_usage-custnum.html",
+ 'cust_main' => $cust_main,
+ 'actionlabel' => emt('Data usage report'),
+ 'width' => 480,
+ 'height' => 245,
+ &>
+% }
% } # unless $opt{no_links}
@@ -201,8 +212,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 +271,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;
}