projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
259747e
)
and hopefully actually using the count will finally do it, RT#5083
author
ivan
<ivan>
Mon, 30 Mar 2009 05:08:53 +0000
(
05:08
+0000)
committer
ivan
<ivan>
Mon, 30 Mar 2009 05:08:53 +0000
(
05:08
+0000)
FS/FS/cust_pkg.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_pkg.pm
b/FS/FS/cust_pkg.pm
index
86ce255
..
348b1e4
100644
(file)
--- a/
FS/FS/cust_pkg.pm
+++ b/
FS/FS/cust_pkg.pm
@@
-1415,14
+1415,14
@@
services.
sub cust_svc {
my $self = shift;
sub cust_svc {
my $self = shift;
+ return () unless $self->num_cust_svc(@_);
+
if ( @_ ) {
return qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum,
'svcpart' => shift, } );
}
if ( @_ ) {
return qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum,
'svcpart' => shift, } );
}
- return () unless $self->num_cust_svc;
-
- cluck "cust_pkg->cust_svc called" if $DEBUG > 1;
+ cluck "cust_pkg->cust_svc called" if $DEBUG > 2;
#if ( $self->{'_svcnum'} ) {
# values %{ $self->{'_svcnum'}->cache };
#if ( $self->{'_svcnum'} ) {
# values %{ $self->{'_svcnum'}->cache };
@@
-1496,8
+1496,9
@@
sub num_cust_svc {
my $self = shift;
return $self->{'_num_cust_svc'}
my $self = shift;
return $self->{'_num_cust_svc'}
- if !@_ && exists($self->{'_num_cust_svc'})
- && $self->{'_num_cust_svc'} =~ /\d/;
+ if !scalar(@_)
+ && exists($self->{'_num_cust_svc'})
+ && $self->{'_num_cust_svc'} =~ /\d/;
my $sql = 'SELECT COUNT(*) FROM cust_svc WHERE pkgnum = ?';
$sql .= ' AND svcpart = ?' if @_;
my $sql = 'SELECT COUNT(*) FROM cust_svc WHERE pkgnum = ?';
$sql .= ' AND svcpart = ?' if @_;