projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix intro rates packages vs discounts, RT#83503
[freeside.git]
/
FS
/
FS
/
part_pkg
/
recur_Common.pm
diff --git
a/FS/FS/part_pkg/recur_Common.pm
b/FS/FS/part_pkg/recur_Common.pm
index
0103b95
..
6abe098
100644
(file)
--- a/
FS/FS/part_pkg/recur_Common.pm
+++ b/
FS/FS/part_pkg/recur_Common.pm
@@
-21,16
+21,16
@@
sub base_recur {
sub calc_setup {
# moved from all descendant packages which just had $self->option('setup_fee')
sub calc_setup {
# moved from all descendant packages which just had $self->option('setup_fee')
- my($self, $cust_pkg, $
sdat
e, $details, $param) = @_;
+ my($self, $cust_pkg, $
tim
e, $details, $param) = @_;
- return 0 if $self->prorate_setup($cust_pkg, $
sdat
e);
+ return 0 if $self->prorate_setup($cust_pkg, $
tim
e);
my $charge = $self->option('setup_fee');
my $discount = 0;
if ( $charge > 0 ) {
$param->{'setup_charge'} = $charge;
my $charge = $self->option('setup_fee');
my $discount = 0;
if ( $charge > 0 ) {
$param->{'setup_charge'} = $charge;
- $discount = $self->calc_discount($cust_pkg,
$sdat
e, $details, $param);
+ $discount = $self->calc_discount($cust_pkg,
\$tim
e, $details, $param);
delete $param->{'setup_charge'};
}
delete $param->{'setup_charge'};
}