projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix discounts w/quantities, RT#23530
[freeside.git]
/
FS
/
FS
/
part_pkg
/
flat.pm
diff --git
a/FS/FS/part_pkg/flat.pm
b/FS/FS/part_pkg/flat.pm
index
22eb698
..
6118fd2
100644
(file)
--- a/
FS/FS/part_pkg/flat.pm
+++ b/
FS/FS/part_pkg/flat.pm
@@
-120,9
+120,7
@@
sub calc_setup {
push @$details, $self->option( 'additional_info' . $i++ );
}
push @$details, $self->option( 'additional_info' . $i++ );
}
- my $quantity = $cust_pkg->quantity || 1;
-
- my $charge = $quantity * $self->unit_setup($cust_pkg, $sdate, $details);
+ my $charge = $self->base_setup($cust_pkg, $sdate, $details);
my $discount = 0;
if ( $charge > 0 ) {
my $discount = 0;
if ( $charge > 0 ) {
@@
-131,10
+129,10
@@
sub calc_setup {
delete $param->{'setup_charge'};
}
delete $param->{'setup_charge'};
}
- sprintf(
'%.2f', $charge - $discount
);
+ sprintf(
'%.2f', ($cust_pkg->quantity || 1) * ($charge - $discount)
);
}
}
-sub
unit
_setup {
+sub
base
_setup {
my($self, $cust_pkg, $sdate, $details ) = @_;
$self->option('setup_fee') || 0;
my($self, $cust_pkg, $sdate, $details ) = @_;
$self->option('setup_fee') || 0;
@@
-162,11
+160,9
@@
sub calc_recur {
$charge *= $param->{freq_override} if $param->{freq_override};
}
$charge *= $param->{freq_override} if $param->{freq_override};
}
- my $quantity = $cust_pkg->quantity || 1;
- $charge *= $quantity;
-
my $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param);
my $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param);
- return sprintf('%.2f', $charge - $discount);
+
+ sprintf( '%.2f', ($cust_pkg->quantity || 1) * ($charge - $discount) );
}
sub cutoff_day {
}
sub cutoff_day {