projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
8acc996
)
apply discount to setup fees, part 1 of 2, RT11512
author
levinse
<levinse>
Fri, 29 Apr 2011 12:16:47 +0000
(12:16 +0000)
committer
levinse
<levinse>
Fri, 29 Apr 2011 12:16:47 +0000
(12:16 +0000)
FS/FS/part_pkg/flat.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_pkg/flat.pm
b/FS/FS/part_pkg/flat.pm
index
c9f2858
..
7837acc
100644
(file)
--- a/
FS/FS/part_pkg/flat.pm
+++ b/
FS/FS/part_pkg/flat.pm
@@
-98,7
+98,12
@@
sub calc_setup {
my $quantity = $cust_pkg->quantity || 1;
- sprintf("%.2f", $quantity * $self->unit_setup($cust_pkg, $sdate, $details) );
+ my $charge = $quantity * $self->unit_setup($cust_pkg, $sdate, $details);
+
+ my $param = { 'setup_charge' => $charge };
+ my $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param);
+
+ sprintf('%.2f', $charge - $discount);
}
sub unit_setup {