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 ) {
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;
- return $self->num_ncancelled_pkgs unless wantarray;
+ return $self->num_ncancelled_pkgs($extra_qsearch) unless wantarray;
my @cust_pkg = ();
if ( $self->{'_pkgnum'} ) {
my $total_pkgs = $cust_main->all_pkgs;
-my $num_method = $hide_cancelled ? 'ncancelled_pkgs' : 'all_pkgs';
-my $num_pkgs = $cust_main->$num_method({
+my $method = $hide_cancelled ? 'ncancelled_pkgs' : 'all_pkgs';
+my $num_pkgs = $cust_main->$method({
'addl_from' => $addl_from,
'extra_sql' => $extra_sql,
});
my $maxrecords = 10;
my $offset = $cgi->param('offset') =~ /^(\d+)$/ ? $1 : 0;
-my @packages = $cust_main->all_pkgs( {
+my @packages = $cust_main->$method( {
'select' => "$cust_pkg_fields, $part_pkg_fields, $num_svcs",
'addl_from' => $addl_from. "
LEFT JOIN part_pkg_option AS setup_option