projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix next-bill-ignore-time, RT#24318, RT#24476, RT#12570
[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
3837ad2
..
608dbe1
100644
(file)
--- a/
FS/FS/cust_main/Billing.pm
+++ b/
FS/FS/cust_main/Billing.pm
@@
-116,8
+116,13
@@
sub bill_and_collect {
$options{'actual_time'} ||= time;
my $job = $options{'job'};
$options{'actual_time'} ||= time;
my $job = $options{'job'};
+ my $actual_time = ( $conf->exists('next-bill-ignore-time')
+ ? day_end( $options{actual_time} )
+ : $options{actual_time}
+ );
+
$job->update_statustext('0,cleaning expired packages') if $job;
$job->update_statustext('0,cleaning expired packages') if $job;
- $error = $self->cancel_expired_pkgs(
day_end( $options{actual_time} )
);
+ $error = $self->cancel_expired_pkgs(
$actual_time
);
if ( $error ) {
$error = "Error expiring custnum ". $self->custnum. ": $error";
if ( $options{fatal} && $options{fatal} eq 'return' ) { return $error; }
if ( $error ) {
$error = "Error expiring custnum ". $self->custnum. ": $error";
if ( $options{fatal} && $options{fatal} eq 'return' ) { return $error; }
@@
-125,7
+130,7
@@
sub bill_and_collect {
else { warn $error; }
}
else { warn $error; }
}
- $error = $self->suspend_adjourned_pkgs(
day_end( $options{actual_time} )
);
+ $error = $self->suspend_adjourned_pkgs(
$actual_time
);
if ( $error ) {
$error = "Error adjourning custnum ". $self->custnum. ": $error";
if ( $options{fatal} && $options{fatal} eq 'return' ) { return $error; }
if ( $error ) {
$error = "Error adjourning custnum ". $self->custnum. ": $error";
if ( $options{fatal} && $options{fatal} eq 'return' ) { return $error; }
@@
-133,7
+138,7
@@
sub bill_and_collect {
else { warn $error; }
}
else { warn $error; }
}
- $error = $self->unsuspend_resumed_pkgs(
day_end( $options{actual_time} )
);
+ $error = $self->unsuspend_resumed_pkgs(
$actual_time
);
if ( $error ) {
$error = "Error resuming custnum ".$self->custnum. ": $error";
if ( $options{fatal} && $options{fatal} eq 'return' ) { return $error; }
if ( $error ) {
$error = "Error resuming custnum ".$self->custnum. ": $error";
if ( $options{fatal} && $options{fatal} eq 'return' ) { return $error; }
@@
-351,6
+356,11
@@
sub bill {
my $time = $options{'time'} || time;
my $invoice_time = $options{'invoice_time'} || $time;
my $time = $options{'time'} || time;
my $invoice_time = $options{'invoice_time'} || $time;
+ my $cmp_time = ( $conf->exists('next-bill-ignore-time')
+ ? day_end( $time )
+ : $time
+ );
+
$options{'not_pkgpart'} ||= {};
$options{'not_pkgpart'} = { map { $_ => 1 }
split(/\s*,\s*/, $options{'not_pkgpart'})
$options{'not_pkgpart'} ||= {};
$options{'not_pkgpart'} = { map { $_ => 1 }
split(/\s*,\s*/, $options{'not_pkgpart'})
@@
-438,7
+448,7
@@
sub bill {
my $next_bill = $cust_pkg->getfield('bill') || 0;
my $error;
my $next_bill = $cust_pkg->getfield('bill') || 0;
my $error;
- while ( $next_bill <= $time ) {
+ while ( $next_bill <= $
cmp_
time ) {
$error =
$self->_make_lines( 'part_pkg' => $part_pkg,
'cust_pkg' => $cust_pkg,
$error =
$self->_make_lines( 'part_pkg' => $part_pkg,
'cust_pkg' => $cust_pkg,
@@
-799,7
+809,7
@@
sub calculate_taxes {
my %packagemap = map { $_->pkgnum => $_ } @$cust_bill_pkg;
foreach my $tax ( keys %$taxlisthash ) {
foreach ( @{ $taxlisthash->{$tax} }[1 .. scalar(@{ $taxlisthash->{$tax}}) - 1] ) {
my %packagemap = map { $_->pkgnum => $_ } @$cust_bill_pkg;
foreach my $tax ( keys %$taxlisthash ) {
foreach ( @{ $taxlisthash->{$tax} }[1 .. scalar(@{ $taxlisthash->{$tax}}) - 1] ) {
- next unless ref($_) eq 'FS::cust_bill_pkg';
+ next unless ref($_) eq 'FS::cust_bill_pkg';
#IS needed for CCH tax-on-tax
my @cust_tax_exempt_pkg = splice( @{ $_->_cust_tax_exempt_pkg } );
my @cust_tax_exempt_pkg = splice( @{ $_->_cust_tax_exempt_pkg } );
@@
-901,6
+911,11
@@
sub _make_lines {
$cust_pkg->pkgpart($part_pkg->pkgpart);
$cust_pkg->pkgpart($part_pkg->pkgpart);
+ my $cmp_time = ( $conf->exists('next-bill-ignore-time')
+ ? day_end( $time )
+ : $time
+ );
+
###
# bill setup
###
###
# bill setup
###
@@
-914,7
+929,7
@@
sub _make_lines {
and ( $options{'resetup'}
|| ( ! $cust_pkg->setup
&& ( ! $cust_pkg->start_date
and ( $options{'resetup'}
|| ( ! $cust_pkg->setup
&& ( ! $cust_pkg->start_date
- || $cust_pkg->start_date <=
day_end($time)
+ || $cust_pkg->start_date <=
$cmp_time
)
&& ( ! $conf->exists('disable_setup_suspended_pkgs')
|| ( $conf->exists('disable_setup_suspended_pkgs') &&
)
&& ( ! $conf->exists('disable_setup_suspended_pkgs')
|| ( $conf->exists('disable_setup_suspended_pkgs') &&
@@
-963,7
+978,7
@@
sub _make_lines {
&& ! $cust_pkg->option('no_suspend_bill',1)
)
and
&& ! $cust_pkg->option('no_suspend_bill',1)
)
and
- ( $part_pkg->freq ne '0' && ( $cust_pkg->bill || 0 ) <=
day_end($time)
)
+ ( $part_pkg->freq ne '0' && ( $cust_pkg->bill || 0 ) <=
$cmp_time
)
|| ( $part_pkg->plan eq 'voip_cdr'
&& $part_pkg->option('bill_every_call')
)
|| ( $part_pkg->plan eq 'voip_cdr'
&& $part_pkg->option('bill_every_call')
)
@@
-987,7
+1002,7
@@
sub _make_lines {
#over two params! lets at least switch to a hashref for the rest...
my $increment_next_bill = ( $part_pkg->freq ne '0'
#over two params! lets at least switch to a hashref for the rest...
my $increment_next_bill = ( $part_pkg->freq ne '0'
- && ( $cust_pkg->getfield('bill') || 0 ) <=
day_end($time)
+ && ( $cust_pkg->getfield('bill') || 0 ) <=
$cmp_time
&& !$options{cancel}
);
my %param = ( %setup_param,
&& !$options{cancel}
);
my %param = ( %setup_param,
@@
-1150,6
+1165,10
@@
sub _make_lines {
return $error if $error;
}
return $error if $error;
}
+ $cust_bill_pkg->set_display( part_pkg => $part_pkg,
+ real_pkgpart => $real_pkgpart,
+ );
+
push @$cust_bill_pkgs, $cust_bill_pkg;
} #if $setup != 0 || $recur != 0
push @$cust_bill_pkgs, $cust_bill_pkg;
} #if $setup != 0 || $recur != 0
@@
-1215,6
+1234,8
@@
sub _handle_taxes {
? 'ship_'
: '';
%taxhash = map { $_ => $self->get("$prefix$_") } @loc_keys;
? 'ship_'
: '';
%taxhash = map { $_ => $self->get("$prefix$_") } @loc_keys;
+ # special case--there's no 'ship_district' field
+ $taxhash{'district'} = $self->get('district');
}
$taxhash{'taxclass'} = $part_pkg->taxclass;
}
$taxhash{'taxclass'} = $part_pkg->taxclass;
@@
-1265,12
+1286,6
@@
sub _handle_taxes {
}
}
- #what's this doing in the middle of _handle_taxes? probably should split
- #this into three parts above in _make_lines
- $cust_bill_pkg->set_display( part_pkg => $part_pkg,
- real_pkgpart => $real_pkgpart,
- );
-
my %tax_cust_bill_pkg = $cust_bill_pkg->disintegrate;
foreach my $key (keys %tax_cust_bill_pkg) {
my @taxes = @{ $taxes{$key} || [] };
my %tax_cust_bill_pkg = $cust_bill_pkg->disintegrate;
foreach my $key (keys %tax_cust_bill_pkg) {
my @taxes = @{ $taxes{$key} || [] };
@@
-1751,8
+1766,9
@@
sub due_cust_event {
#???
#my $DEBUG = $opt{'debug'}
#???
#my $DEBUG = $opt{'debug'}
+ $opt{'debug'} ||= 0; # silence some warnings
local($DEBUG) = $opt{'debug'}
local($DEBUG) = $opt{'debug'}
- if
defined($opt{'debug'}) &&
$opt{'debug'} > $DEBUG;
+ if $opt{'debug'} > $DEBUG;
$DEBUG = $FS::cust_main::DEBUG if $FS::cust_main::DEBUG > $DEBUG;
warn "$me due_cust_event called with options ".
$DEBUG = $FS::cust_main::DEBUG if $FS::cust_main::DEBUG > $DEBUG;
warn "$me due_cust_event called with options ".