projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix customer package browse selection, RT#39822
[freeside.git]
/
FS
/
FS
/
cust_main
/
Packages.pm
diff --git
a/FS/FS/cust_main/Packages.pm
b/FS/FS/cust_main/Packages.pm
index
1c921d6
..
13c2945
100644
(file)
--- a/
FS/FS/cust_main/Packages.pm
+++ b/
FS/FS/cust_main/Packages.pm
@@
-434,7
+434,7
@@
sub all_pkgs {
my $self = shift;
my $extra_qsearch = ref($_[0]) ? shift : { @_ };
my $self = shift;
my $extra_qsearch = ref($_[0]) ? shift : { @_ };
- return $self->num_pkgs
unless wantarray || keys %$extra_qsearch
;
+ return $self->num_pkgs
($extra_qsearch) unless wantarray
;
my @cust_pkg = ();
if ( $self->{'_pkgnum'} && ! keys %$extra_qsearch ) {
my @cust_pkg = ();
if ( $self->{'_pkgnum'} && ! keys %$extra_qsearch ) {
@@
-464,11
+464,11
@@
Returns all non-cancelled packages (see L<FS::cust_pkg>) for this customer.
sub ncancelled_pkgs {
my $self = shift;
sub ncancelled_pkgs {
my $self = shift;
- my $extra_qsearch = ref($_[0]) ? shift : {};
+ my $extra_qsearch = ref($_[0]) ? shift : {
@_
};
local($DEBUG) = $FS::cust_main::DEBUG if $FS::cust_main::DEBUG > $DEBUG;
local($DEBUG) = $FS::cust_main::DEBUG if $FS::cust_main::DEBUG > $DEBUG;
- return $self->num_ncancelled_pkgs unless wantarray;
+ return $self->num_ncancelled_pkgs
($extra_qsearch)
unless wantarray;
my @cust_pkg = ();
if ( $self->{'_pkgnum'} ) {
my @cust_pkg = ();
if ( $self->{'_pkgnum'} ) {