projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
multiple payment options (new complimentary flag), RT#23741
[freeside.git]
/
FS
/
FS
/
cust_main
/
Billing.pm
diff --git
a/FS/FS/cust_main/Billing.pm
b/FS/FS/cust_main/Billing.pm
index
f65d495
..
b3d4e70
100644
(file)
--- a/
FS/FS/cust_main/Billing.pm
+++ b/
FS/FS/cust_main/Billing.pm
@@
-390,7
+390,7
@@
terms or the default terms are used.
sub bill {
my( $self, %options ) = @_;
sub bill {
my( $self, %options ) = @_;
- return '' if $self->
payby eq 'COMP
';
+ return '' if $self->
complimentary eq 'Y
';
local($DEBUG) = $FS::cust_main::DEBUG if $FS::cust_main::DEBUG > $DEBUG;
my $log = FS::Log->new('FS::cust_main::Billing::bill');
local($DEBUG) = $FS::cust_main::DEBUG if $FS::cust_main::DEBUG > $DEBUG;
my $log = FS::Log->new('FS::cust_main::Billing::bill');
@@
-946,7
+946,9
@@
sub _make_lines {
my $setup = 0;
my $unitsetup = 0;
my @setup_discounts = ();
my $setup = 0;
my $unitsetup = 0;
my @setup_discounts = ();
- my %setup_param = ( 'discounts' => \@setup_discounts );
+ my %setup_param = ( 'discounts' => \@setup_discounts,
+ 'real_pkgpart' => $params{real_pkgpart}
+ );
my $setup_billed_currency = '';
my $setup_billed_amount = 0;
# Conditions for setting setup date and charging the setup fee:
my $setup_billed_currency = '';
my $setup_billed_amount = 0;
# Conditions for setting setup date and charging the setup fee: