projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5e1f39e
)
sqlradacct_hour.pm: don't truncate per byte/hour overage charges at 2 decimal places
author
levinse
<levinse>
Sun, 5 Jun 2011 16:31:18 +0000
(16:31 +0000)
committer
levinse
<levinse>
Sun, 5 Jun 2011 16:31:18 +0000
(16:31 +0000)
FS/FS/part_pkg/sqlradacct_hour.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_pkg/sqlradacct_hour.pm
b/FS/FS/part_pkg/sqlradacct_hour.pm
index
1c198a1
..
a2b64c7
100644
(file)
--- a/
FS/FS/part_pkg/sqlradacct_hour.pm
+++ b/
FS/FS/part_pkg/sqlradacct_hour.pm
@@
-106,25
+106,25
@@
sub calc_recur {
$output = 0 if $output < 0;
my $totalcharge =
$output = 0 if $output < 0;
my $totalcharge =
-
$total * sprintf('%.2f',
$self->option('recur_total_charge'));
+
sprintf('%.2f', $total *
$self->option('recur_total_charge'));
$totalcharge = $self->option('recur_total_cap')
if $self->option('recur_total_cap')
&& $totalcharge > $self->option('recur_total_cap');
my $inputcharge =
$totalcharge = $self->option('recur_total_cap')
if $self->option('recur_total_cap')
&& $totalcharge > $self->option('recur_total_cap');
my $inputcharge =
-
$input * sprintf('%.2f',
$self->option('recur_input_charge'));
+
sprintf('%.2f', $input *
$self->option('recur_input_charge'));
$inputcharge = $self->option('recur_input_cap')
if $self->option('recur_input_cap')
&& $inputcharge > $self->option('recur_input_cap');
my $outputcharge =
$inputcharge = $self->option('recur_input_cap')
if $self->option('recur_input_cap')
&& $inputcharge > $self->option('recur_input_cap');
my $outputcharge =
-
$output * sprintf('%.2f',
$self->option('recur_output_charge'));
+
sprintf('%.2f', $output *
$self->option('recur_output_charge'));
$outputcharge = $self->option('recur_output_cap')
if $self->option('recur_output_cap')
&& $outputcharge > $self->option('recur_output_cap');
my $hourscharge =
$outputcharge = $self->option('recur_output_cap')
if $self->option('recur_output_cap')
&& $outputcharge > $self->option('recur_output_cap');
my $hourscharge =
-
$hours * sprintf('%.2f',
$self->option('recur_hourly_charge'));
+
sprintf('%.2f', $hours *
$self->option('recur_hourly_charge'));
$hourscharge = $self->option('recur_hourly_cap')
if $self->option('recur_hourly_cap')
&& $hourscharge > $self->option('recur_hourly_cap');
$hourscharge = $self->option('recur_hourly_cap')
if $self->option('recur_hourly_cap')
&& $hourscharge > $self->option('recur_hourly_cap');