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
/
flat.pm
diff --git
a/FS/FS/part_pkg/flat.pm
b/FS/FS/part_pkg/flat.pm
index
db493e7
..
cfcfb02
100644
(file)
--- a/
FS/FS/part_pkg/flat.pm
+++ b/
FS/FS/part_pkg/flat.pm
@@
-121,9
+121,9
@@
sub price_info {
}
sub calc_setup {
}
sub calc_setup {
- 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 $i = 0;
my $count = $self->option( 'additional_count', 'quiet' ) || 0;
my $i = 0;
my $count = $self->option( 'additional_count', 'quiet' ) || 0;
@@
-131,12
+131,12
@@
sub calc_setup {
push @$details, $self->option( 'additional_info' . $i++ );
}
push @$details, $self->option( 'additional_info' . $i++ );
}
- my $charge = $self->unit_setup($cust_pkg, $
sdat
e, $details);
+ my $charge = $self->unit_setup($cust_pkg, $
tim
e, $details);
my $discount = 0;
if ( $charge > 0 ) {
$param->{'setup_charge'} = $charge;
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'};
}
@@
-144,7
+144,7
@@
sub calc_setup {
}
sub unit_setup {
}
sub unit_setup {
- my($self, $cust_pkg, $
sdat
e, $details ) = @_;
+ my($self, $cust_pkg, $
tim
e, $details ) = @_;
$self->option('setup_fee', 1) || 0;
}
$self->option('setup_fee', 1) || 0;
}