projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix recur_Common packages with setup discounts
[freeside.git]
/
FS
/
FS
/
part_pkg
/
discount_Mixin.pm
diff --git
a/FS/FS/part_pkg/discount_Mixin.pm
b/FS/FS/part_pkg/discount_Mixin.pm
index
87ec3a7
..
3dc3f6e
100644
(file)
--- a/
FS/FS/part_pkg/discount_Mixin.pm
+++ b/
FS/FS/part_pkg/discount_Mixin.pm
@@
-1,14
+1,12
@@
package FS::part_pkg::discount_Mixin;
use strict;
package FS::part_pkg::discount_Mixin;
use strict;
-use vars qw(@ISA %info);
-use FS::part_pkg;
+use vars qw( %info );
+use Time::Local qw( timelocal );
+use List::Util qw( min );
use FS::cust_pkg;
use FS::cust_bill_pkg_discount;
use FS::cust_pkg;
use FS::cust_bill_pkg_discount;
-use Time::Local qw(timelocal);
-use List::Util 'min';
-@ISA = qw(FS::part_pkg);
%info = ( 'disabled' => 1 );
=head1 NAME
%info = ( 'disabled' => 1 );
=head1 NAME
@@
-40,6
+38,7
@@
discount and generates an invoice detail describing it.
sub calc_discount {
my($self, $cust_pkg, $sdate, $details, $param ) = @_;
sub calc_discount {
my($self, $cust_pkg, $sdate, $details, $param ) = @_;
+ my $conf = new FS::Conf;
my $br = $self->base_recur_permonth($cust_pkg, $sdate);
$br += $param->{'override_charges'} if $param->{'override_charges'};
my $br = $self->base_recur_permonth($cust_pkg, $sdate);
$br += $param->{'override_charges'} if $param->{'override_charges'};
@@
-155,7
+154,6
@@
sub calc_discount {
push @{ $param->{'discounts'} }, $cust_bill_pkg_discount;
#add details on discount to invoice
push @{ $param->{'discounts'} }, $cust_bill_pkg_discount;
#add details on discount to invoice
- my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
$months = sprintf('%.2f', $months) if $months =~ /\./;
my $money_char = $conf->config('money_char') || '$';
$months = sprintf('%.2f', $months) if $months =~ /\./;