[freeside-commits] freeside/FS/FS cust_svc.pm,1.85,1.86

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv336/FS/FS

Modified Files:
	cust_svc.pm 
Log Message:
count available services correctly, RT#10340

Index: cust_svc.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_svc.pm,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -w -d -r1.85 -r1.86
--- cust_svc.pm	9 Dec 2010 19:26:19 -0000	1.85
+++ cust_svc.pm	8 Jan 2011 05:21:10 -0000	1.86
@@ -307,22 +307,11 @@
   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;
+    ($part_svc) = grep { $_->svcpart == $self->svcpart } $cust_pkg->part_svc;
 
-    my @cust_svc = qsearch('cust_svc', {
-      'pkgnum'  => $self->pkgnum,
-      'svcpart' => $self->svcpart,
-    });
-    return "Already ". scalar(@cust_svc). " ". $part_svc->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;