projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
37cd5b0
)
make apply_usage work right with null classnum, from #5738
author
Mark Wells
<mark@freeside.biz>
Tue, 12 Mar 2013 20:21:02 +0000
(13:21 -0700)
committer
Mark Wells
<mark@freeside.biz>
Tue, 12 Mar 2013 20:21:02 +0000
(13:21 -0700)
FS/FS/cust_pkg.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_pkg.pm
b/FS/FS/cust_pkg.pm
index
92aa43f
..
87acf0e
100644
(file)
--- a/
FS/FS/cust_pkg.pm
+++ b/
FS/FS/cust_pkg.pm
@@
-3337,6
+3337,12
@@
sub apply_usage {
my $dbh = dbh;
my $order = FS::Conf->new->config('cdr-minutes_priority');
my $dbh = dbh;
my $order = FS::Conf->new->config('cdr-minutes_priority');
+ my $is_classnum;
+ if ( $classnum ) {
+ $is_classnum = ' part_pkg_usage_class.classnum = '.$classnum;
+ } else {
+ $is_classnum = ' part_pkg_usage_class.classnum IS NULL';
+ }
my @usage_recs = qsearch({
'table' => 'cust_pkg_usage',
'addl_from' => ' JOIN part_pkg_usage USING (pkgusagepart)'.
my @usage_recs = qsearch({
'table' => 'cust_pkg_usage',
'addl_from' => ' JOIN part_pkg_usage USING (pkgusagepart)'.
@@
-3346,7
+3352,7
@@
sub apply_usage {
'extra_sql' => " WHERE ( cust_pkg.pkgnum = $pkgnum OR ".
" ( cust_pkg.custnum = $custnum AND ".
" part_pkg_usage.shared IS NOT NULL ) ) AND ".
'extra_sql' => " WHERE ( cust_pkg.pkgnum = $pkgnum OR ".
" ( cust_pkg.custnum = $custnum AND ".
" part_pkg_usage.shared IS NOT NULL ) ) AND ".
-
" part_pkg_usage_class.classnum = $classnum AND "
.
+
$is_classnum . ' AND '
.
" cust_pkg_usage.minutes > 0",
'order_by' => " ORDER BY priority ASC",
});
" cust_pkg_usage.minutes > 0",
'order_by' => " ORDER BY priority ASC",
});