diff options
author | mark <mark> | 2010-11-14 09:10:21 +0000 |
---|---|---|
committer | mark <mark> | 2010-11-14 09:10:21 +0000 |
commit | 0e7d7ec762a547d80ad19eeb5ea35342392bc944 (patch) | |
tree | 2a8991205eb21651fcddcf6f6afd9d3c9aa1f9df /FS/FS/cust_pkg.pm | |
parent | ff92fba056c2b61753d464c84ecede6ec2f57258 (diff) |
better hidden pkg_svc flag, RT#9871
Diffstat (limited to 'FS/FS/cust_pkg.pm')
-rw-r--r-- | FS/FS/cust_pkg.pm | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index e0fb589..66d8bae 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -1650,21 +1650,19 @@ I<pkg_svc.hidden> flag will be omitted. sub h_cust_svc { my $self = shift; my ($end, $start, $mode) = @_; - my %search = ( - 'table' => 'h_cust_svc', - 'hashref' => { 'pkgnum' => $self->pkgnum } + my @cust_svc = $self->_sort_cust_svc( + [ qsearch( 'h_cust_svc', + { 'pkgnum' => $self->pkgnum, }, + FS::h_cust_svc->sql_h_search(@_), + ) ] ); - @search{'select', 'extra_sql', 'cache_obj', 'addl_from'} = - FS::h_cust_svc->sql_h_search($end, $start); if ( $mode eq 'I' ) { - $search{'addl_from'} .= ' JOIN cust_pkg USING (pkgnum) - JOIN pkg_svc USING (pkgpart, svcpart)'; - $search{'extra_sql'} = ' AND pkg_svc.hidden IS NULL '.$search{'extra_sql'}; + my %hidden_svcpart = map { $_->svcpart => $_->hidden } $self->part_svc; + return grep { !$hidden_svcpart{$_->svcpart} } @cust_svc; + } + else { + return @cust_svc; } - - $self->_sort_cust_svc( - [ qsearch(\%search) ] - ); } sub _sort_cust_svc { @@ -1767,6 +1765,7 @@ sub part_svc { max( 0, $pkg_svc->quantity - $num_cust_svc ); $part_svc->{'Hash'}{'cust_pkg_svc'} = $num_cust_svc ? [ $self->cust_svc($part_svc->svcpart) ] : []; + $part_svc->{'Hash'}{'hidden'} = $pkg_svc->hidden; $part_svc; } $self->part_pkg->pkg_svc; |