diff options
| -rw-r--r-- | FS/FS/cust_main/Billing.pm | 32 | ||||
| -rw-r--r-- | FS/FS/cust_main/Billing_Realtime.pm | 12 | ||||
| -rw-r--r-- | FS/FS/cust_main/Packages.pm | 6 |
3 files changed, 48 insertions, 2 deletions
diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm index 639d5945a..96ffe41f4 100644 --- a/FS/FS/cust_main/Billing.pm +++ b/FS/FS/cust_main/Billing.pm @@ -306,7 +306,11 @@ terms or the default terms are used. sub bill { my( $self, %options ) = @_; + return '' if $self->payby eq 'COMP'; + + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; + warn "$me bill customer ". $self->custnum. "\n" if $DEBUG; @@ -431,6 +435,10 @@ sub bill { next unless @cust_bill_pkg; #don't create an invoice w/o line items + warn "$me billing pass $pass\n". + Dumper(\@cust_bill_pkg)."\n" + if $DEBUG > 2; + if ( scalar( grep { $_->recur && $_->recur > 0 } @cust_bill_pkg) || !$conf->exists('postal_invoice-recurring_only') ) @@ -633,9 +641,13 @@ jurisdictions (i.e. Texas) have tax exemptions which are date sensitive. sub calculate_taxes { my ($self, $cust_bill_pkg, $taxlisthash, $invoice_time) = @_; - my @tax_line_items = (); + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; - warn "having a look at the taxes we found...\n" if $DEBUG > 2; + warn "$me calculate_taxes\n". + Dumper($self, $cust_bill_pkg, $taxlisthash, $invoice_time). "\n" + if $DEBUG > 2; + + my @tax_line_items = (); # keys are tax names (as printed on invoices / itemdesc ) # values are listrefs of taxlisthash keys (internal identifiers) @@ -774,6 +786,8 @@ sub calculate_taxes { sub _make_lines { my ($self, %params) = @_; + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; + my $part_pkg = $params{part_pkg} or die "no part_pkg specified"; my $cust_pkg = $params{cust_pkg} or die "no cust_pkg specified"; my $precommit_hooks = $params{precommit_hooks} or die "no package specified"; @@ -1015,6 +1029,8 @@ sub _handle_taxes { my $real_pkgpart = shift; my $options = shift; + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; + my %cust_bill_pkg = (); my %taxes = (); @@ -1212,6 +1228,8 @@ sub _gather_taxes { my $part_pkg = shift; my $class = shift; + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; + my @taxes = (); my $geocode = $self->geocode('cch'); @@ -1291,6 +1309,9 @@ Debugging level. Default is 0 (no debugging), or can be set to 1 (passed-in opt sub collect { my( $self, %options ) = @_; + + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; + my $invoice_time = $options{'invoice_time'} || time; #put below somehow? @@ -1474,6 +1495,9 @@ Debugging level. Default is 0 (no debugging), or can be set to 1 (passed-in opt sub do_cust_event { my( $self, %options ) = @_; + + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; + my $time = $options{'time'} || time; #put below somehow? @@ -1686,6 +1710,9 @@ by prepaying the most recent invoice for MONTHS. sub discount_term_values { my $self = shift; my $term = shift; + + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; + warn "$me discount_term_values called with $term\n" if $DEBUG; my %result = (); @@ -1778,6 +1805,7 @@ sub due_cust_event { #my $DEBUG = $opt{'debug'} local($DEBUG) = $opt{'debug'} if defined($opt{'debug'}) && $opt{'debug'} > $DEBUG; + $DEBUG = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; warn "$me due_cust_event called with options ". join(', ', map { "$_: $opt{$_}" } keys %opt). "\n" diff --git a/FS/FS/cust_main/Billing_Realtime.pm b/FS/FS/cust_main/Billing_Realtime.pm index 60554957b..46d531af8 100644 --- a/FS/FS/cust_main/Billing_Realtime.pm +++ b/FS/FS/cust_main/Billing_Realtime.pm @@ -89,6 +89,8 @@ I<depend_jobnum> allows payment capture to unlock export jobs sub realtime_collect { my( $self, %options ) = @_; + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; + if ( $DEBUG ) { warn "$me realtime_collect:\n"; warn " $_ => $options{$_}\n" foreach keys %options; @@ -287,6 +289,8 @@ my %bop_method2payby = ( sub realtime_bop { my $self = shift; + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; + my %options = (); if (ref($_[0]) eq 'HASH') { %options = %{$_[0]}; @@ -712,6 +716,9 @@ sub fake_bop { sub _realtime_bop_result { my( $self, $cust_pay_pending, $transaction, %options ) = @_; + + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; + if ( $DEBUG ) { warn "$me _realtime_bop_result: pending transaction ". $cust_pay_pending->paypendingnum. "\n"; @@ -992,6 +999,9 @@ upon success) and session_id of any associated session. sub realtime_botpp_capture { my( $self, $cust_pay_pending, %options ) = @_; + + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; + if ( $DEBUG ) { warn "$me realtime_botpp_capture: pending transaction $cust_pay_pending\n"; warn " $_ => $options{$_}\n" foreach keys %options; @@ -1147,6 +1157,8 @@ gateway is attempted. sub realtime_refund_bop { my $self = shift; + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; + my %options = (); if (ref($_[0]) eq 'HASH') { %options = %{$_[0]}; diff --git a/FS/FS/cust_main/Packages.pm b/FS/FS/cust_main/Packages.pm index 2912863e9..103b9435b 100644 --- a/FS/FS/cust_main/Packages.pm +++ b/FS/FS/cust_main/Packages.pm @@ -69,6 +69,8 @@ sub order_pkg { my $self = shift; my $opt = ref($_[0]) ? shift : { @_ }; + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; + warn "$me order_pkg called with options ". join(', ', map { "$_: $opt->{$_}" } keys %$opt ). "\n" if $DEBUG; @@ -187,6 +189,8 @@ sub order_pkgs { my %options = @_; $seconds_ref ||= $options{'seconds_ref'}; + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; + warn "$me order_pkgs called with options ". join(', ', map { "$_: $options{$_}" } keys %options ). "\n" if $DEBUG; @@ -267,6 +271,8 @@ sub ncancelled_pkgs { my $self = shift; my $extra_qsearch = ref($_[0]) ? shift : {}; + local($DEBUG) = $cust_main::DEBUG if $cust_main::DEBUG > $DEBUG; + return $self->num_ncancelled_pkgs unless wantarray; my @cust_pkg = (); |