[freeside-commits] branch master updated. 866980f54aa0ad5a9ace05d30f96c84b842463bb
Carl J. Adams-Collier
cjac at 420.am
Mon Sep 15 18:42:13 PDT 2014
The branch, master has been updated
via 866980f54aa0ad5a9ace05d30f96c84b842463bb (commit)
from df9caf6e66f4fd7a6a5f46438583414314d82107 (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 866980f54aa0ad5a9ace05d30f96c84b842463bb
Author: C.J. Adams-Collier <cjac at colliertech.org>
Date: Mon Sep 15 18:37:25 2014 -0700
FS RT #28105 - found more instances of megabyte to change to gigabyte
diff --git a/FS/FS/part_pkg/sqlradacct_hour.pm b/FS/FS/part_pkg/sqlradacct_hour.pm
index 2f9d833..09cf85c 100644
--- a/FS/FS/part_pkg/sqlradacct_hour.pm
+++ b/FS/FS/part_pkg/sqlradacct_hour.pm
@@ -138,19 +138,19 @@ sub calc_recur {
if ( $self->option('recur_total_charge') > 0 ) {
push @$details,
- sprintf( "Last month's data %.1f %ss: %s", $total, BA, $totalcharge );
+ sprintf( "Last month's data %.3f %ss: %s", $total, BA, $totalcharge );
}
if ( $self->option('recur_input_charge') > 0 ) {
push @$details,
- sprintf( "Last month's download %.1f %ss: %s", $input, BA, $inputcharge );
+ sprintf( "Last month's download %.3f %ss: %s", $input, BA, $inputcharge );
}
if ( $self->option('recur_output_charge') > 0 ) {
push @$details,
- sprintf( "Last month's upload %.1f %ss: %s", $output, BA, $outputcharge );
+ sprintf( "Last month's upload %.3f %ss: %s", $output, BA, $outputcharge );
}
if ( $self->option('recur_hourly_charge') > 0 ) {
push @$details, "Last month\'s time ".
- sprintf('%.1f', $hours). " hours: $hourscharge";
+ sprintf('%.3f', $hours). " hours: $hourscharge";
}
my $charges = $hourscharge + $inputcharge + $outputcharge + $totalcharge;
diff --git a/httemplate/view/elements/svc_radius_usage.html b/httemplate/view/elements/svc_radius_usage.html
index 08d6d53..4719691 100644
--- a/httemplate/view/elements/svc_radius_usage.html
+++ b/httemplate/view/elements/svc_radius_usage.html
@@ -21,10 +21,10 @@
%
% my $input = $svc->attribute_since_sqlradacct(
% $last_bill, time, 'AcctInputOctets'
-% ) / 1048576;
+% ) / 1073741824;
% my $output = $svc->attribute_since_sqlradacct(
% $last_bill, time, 'AcctOutputOctets'
-% ) / 1048576;
+% ) / 1073741824;
%
% my $last_mac = $svc->attribute_last_sqlradacct( 'CallingStationId' );
% if ( $last_mac =~ /^\s*(([\dA-F]{2}[\-:]){5}[\dA-F]{2})/i ) {
@@ -57,8 +57,8 @@
% }
- Upload: <B><% sprintf("%.3f", $input) %></B> megabytes<BR>
- Download: <B><% sprintf("%.3f", $output) %></B> megabytes<BR>
+ Upload: <B><% sprintf("%.3f", $input) %></B> gigabytes<BR>
+ Download: <B><% sprintf("%.3f", $output) %></B> gigabytes<BR>
% if ( $svc->table eq 'svc_acct' ) {
Last Login: <B><% $svc->last_login_text %></B><BR>
% }
-----------------------------------------------------------------------
Summary of changes:
FS/FS/part_pkg/sqlradacct_hour.pm | 8 ++++----
httemplate/view/elements/svc_radius_usage.html | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
More information about the freeside-commits
mailing list