diff options
author | mark <mark> | 2011-01-08 05:21:10 +0000 |
---|---|---|
committer | mark <mark> | 2011-01-08 05:21:10 +0000 |
commit | fdd9ed096075e904cd5a148b3f78615c0591afec (patch) | |
tree | a8249890f3245168d05f3ecab2e645117dc98d24 /FS/FS/cust_svc.pm | |
parent | 1301ab91bba6a9e69ca230c2f687d50c3f291966 (diff) |
count available services correctly, RT#10340
Diffstat (limited to 'FS/FS/cust_svc.pm')
-rw-r--r-- | FS/FS/cust_svc.pm | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm index 0a58d55..f5f14ab 100644 --- a/FS/FS/cust_svc.pm +++ b/FS/FS/cust_svc.pm @@ -307,22 +307,11 @@ sub check { if ( $self->pkgnum ) { my $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } ); return "Unknown pkgnum" unless $cust_pkg; - my $pkg_svc = qsearchs( 'pkg_svc', { - 'pkgpart' => $cust_pkg->pkgpart, - 'svcpart' => $self->svcpart, - }); - # or new FS::pkg_svc ( { 'pkgpart' => $cust_pkg->pkgpart, - # 'svcpart' => $self->svcpart, - # 'quantity' => 0 } ); - my $quantity = $pkg_svc ? $pkg_svc->quantity : 0; - - my @cust_svc = qsearch('cust_svc', { - 'pkgnum' => $self->pkgnum, - 'svcpart' => $self->svcpart, - }); - return "Already ". scalar(@cust_svc). " ". $part_svc->svc. + ($part_svc) = grep { $_->svcpart == $self->svcpart } $cust_pkg->part_svc; + + return "Already ". $part_svc->get('num_cust_svc'). " ". $part_svc->svc. " services for pkgnum ". $self->pkgnum - if scalar(@cust_svc) >= $quantity && !$ignore_quantity; + if $part_svc->get('num_avail') == 0 and !$ignore_quantity; } $self->SUPER::check; |