[freeside-commits] branch master updated. d883a843dcfce64caeddd2a4abb0982c16a17199
Ivan
ivan at 420.am
Sat Aug 9 19:38:17 PDT 2014
The branch, master has been updated
via d883a843dcfce64caeddd2a4abb0982c16a17199 (commit)
via a8121357fa4c5215c19b17e2ed79ced4a7d9fa0b (commit)
from a620ce3b904e9a9ba1da9c990f63f7a94acb785c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d883a843dcfce64caeddd2a4abb0982c16a17199
Merge: a812135 a620ce3
Author: Ivan Kohler <ivan at freeside.biz>
Date: Sat Aug 9 19:38:12 2014 -0700
Merge branch 'master' of git.freeside.biz:/home/git/freeside
commit a8121357fa4c5215c19b17e2ed79ced4a7d9fa0b
Author: Ivan Kohler <ivan at freeside.biz>
Date: Sat Aug 9 19:38:07 2014 -0700
optimize billing for customers with lots of existing packages and invoices, RT#30238
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 1b82e0e..64e3f1c 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2587,8 +2587,9 @@ sub tables_hashref {
'index' => [ ['custnum'], ['pkgpart'], ['pkgbatch'],
['locationnum'], ['usernum'], ['agent_pkgid'],
['order_date'], [ 'start_date' ], ['setup'], ['bill'],
- ['last_bill'], ['susp'], ['adjourn'], ['cancel'],
- ['expire'], ['contract_end'], ['change_date'],
+ ['last_bill'], ['susp'], ['adjourn'], ['resume'],
+ ['cancel'], ['expire'], ['contract_end'],
+ ['change_date'],
['no_auto'],
#['contactnum'],
['salesnum'],
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 7d3185a..cbf95f5 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -3777,9 +3777,17 @@ Returns all the payments (see L<FS::cust_pay>) for this customer.
sub cust_pay {
my $self = shift;
- return $self->num_cust_pay unless wantarray;
- sort { $a->_date <=> $b->_date }
- qsearch( 'cust_pay', { 'custnum' => $self->custnum } )
+ my $opt = ref($_[0]) ? shift : { @_ };
+
+ return $self->num_cust_pay unless wantarray || keys %$opt;
+
+ $opt->{'table'} = 'cust_pay';
+ $opt->{'hashref'}{'custnum'} = $self->custnum;
+
+ map { $_ } #behavior of sort undefined in scalar context
+ sort { $a->_date <=> $b->_date }
+ qsearch($opt);
+
}
=item num_cust_pay
@@ -3797,6 +3805,22 @@ sub num_cust_pay {
$sth->fetchrow_arrayref->[0];
}
+=item unapplied_cust_pay
+
+Returns all the unapplied payments (see L<FS::cust_pay>) for this customer.
+
+=cut
+
+sub unapplied_cust_pay {
+ my $self = shift;
+
+ $self->cust_pay(
+ 'extra_sql' => ' AND '. FS::cust_pay->unapplied_sql. ' > 0',
+ #@_
+ );
+
+}
+
=item cust_pay_pkgnum
Returns all the payments (see L<FS::cust_pay>) for this customer's specific
diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm
index 4f91080..dfc8c86 100644
--- a/FS/FS/cust_main/Billing.pm
+++ b/FS/FS/cust_main/Billing.pm
@@ -730,14 +730,16 @@ sub bill {
my $charged = sprintf('%.2f', ${ $total_setup{$pass} } + ${ $total_recur{$pass} } );
- my @cust_bill = $self->cust_bill;
my $balance = $self->balance;
- my $previous_bill = $cust_bill[-1] if @cust_bill;
- my $previous_balance = 0;
- if ( $previous_bill ) {
- $previous_balance = $previous_bill->billing_balance
- + $previous_bill->charged;
- }
+
+ my $previous_bill = qsearchs({ 'table' => 'cust_bill',
+ 'hashref' => { custnum=>$self->custnum },
+ 'extra_sql' => 'ORDER BY _date DESC LIMIT 1',
+ });
+ my $previous_balance =
+ $previous_bill
+ ? ( $previous_bill->billing_balance + $previous_bill->charged )
+ : 0;
warn "creating the new invoice\n" if $DEBUG;
#create the new invoice
@@ -2426,13 +2428,9 @@ sub apply_payments {
#return 0 unless
- my @payments = sort { $b->_date <=> $a->_date }
- grep { $_->unapplied > 0 }
- $self->cust_pay;
+ my @payments = $self->unapplied_cust_pay;
- my @invoices = sort { $a->_date <=> $b->_date}
- grep { $_->owed > 0 }
- $self->cust_bill;
+ my @invoices = $self->open_cust_bill;
if ( $conf->exists('pkg-balances') ) {
# limit @payments to those w/ a pkgnum grepped from $self
diff --git a/FS/FS/part_event/Condition/inactive_age.pm b/FS/FS/part_event/Condition/inactive_age.pm
index cbf4b9e..562e101 100644
--- a/FS/FS/part_event/Condition/inactive_age.pm
+++ b/FS/FS/part_event/Condition/inactive_age.pm
@@ -57,20 +57,24 @@ sub condition_sql {
# will evaluate to zero if there isn't one
my @sql;
for my $t (qw(cust_pay cust_credit cust_refund)) {
- push @sql,
- "NOT EXISTS( SELECT 1 FROM $t ".
- "WHERE $t.custnum = cust_main.custnum AND $t._date >= $age".
- ")";
+ push @sql, "
+ NOT EXISTS( SELECT 1 FROM $t
+ WHERE $t.custnum = cust_main.custnum AND $t._date >= $age
+ LIMIT 1
+ )
+ ";
}
#cust_bill
- push @sql,
- "NOT EXISTS( ".
- "SELECT 1 FROM cust_bill JOIN cust_bill_pkg USING (invnum) ".
- "JOIN cust_pkg USING (pkgnum) JOIN part_pkg USING (pkgpart) ".
- "WHERE cust_bill.custnum = cust_main.custnum ".
- "AND cust_bill._date >= $age ".
- "AND COALESCE(part_pkg.classnum, -1) != $ignore_pkgclass ".
- ")";
+ push @sql, "
+ NOT EXISTS(
+ SELECT 1 FROM cust_bill JOIN cust_bill_pkg USING (invnum)
+ JOIN cust_pkg USING (pkgnum) JOIN part_pkg USING (pkgpart)
+ WHERE cust_bill.custnum = cust_main.custnum
+ AND cust_bill._date >= $age
+ AND COALESCE(part_pkg.classnum, -1) != $ignore_pkgclass
+ LIMIT 1
+ )
+ ";
join(' AND ', @sql);
}
diff --git a/FS/FS/part_event/Condition/once.pm b/FS/FS/part_event/Condition/once.pm
index d004814..f164582 100644
--- a/FS/FS/part_event/Condition/once.pm
+++ b/FS/FS/part_event/Condition/once.pm
@@ -43,11 +43,12 @@ sub condition_sql {
my %tablenum = %{ FS::part_event->eventtable_pkey_sql };
- "0 = ( SELECT COUNT(*) FROM cust_event
- WHERE cust_event.eventpart = part_event.eventpart
- AND cust_event.tablenum = $tablenum{$table}
- AND status != 'failed'
- )
+ "NOT EXISTS ( SELECT 1 FROM cust_event
+ WHERE cust_event.eventpart = part_event.eventpart
+ AND cust_event.tablenum = $tablenum{$table}
+ AND status != 'failed'
+ LIMIT 1
+ )
";
}
-----------------------------------------------------------------------
Summary of changes:
FS/FS/Schema.pm | 5 +++--
FS/FS/cust_main.pm | 30 +++++++++++++++++++++++++---
FS/FS/cust_main/Billing.pm | 24 ++++++++++------------
FS/FS/part_event/Condition/inactive_age.pm | 28 +++++++++++++++-----------
FS/FS/part_event/Condition/once.pm | 11 +++++-----
5 files changed, 63 insertions(+), 35 deletions(-)
More information about the freeside-commits
mailing list