<rjbs> More of the same: these patches make it safer to subclass FS::part_pkg's pkg_s...

[freeside.git] / httemplate / browse / part_pkg.cgi

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 48b0ab2..8d5b554 100755 (executable)
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -89,8 +89,7 @@ my $taxclasses = $conf->exists('enable_taxclasses');
 
 <%
 foreach my $part_pkg ( sort $sortby @part_pkg ) {
-  my(@pkg_svc)=grep $_->getfield('quantity'),
-    qsearch( 'pkg_svc', { 'pkgpart' => $part_pkg->pkgpart } );
+  my @pkg_svc = $part_pkg->pkg_svc;
   my($rowspan)=scalar(@pkg_svc);
   my $plandata;
   if ( $part_pkg->plan ) {
@@ -145,9 +144,8 @@ foreach my $part_pkg ( sort $sortby @part_pkg ) {
         <TD ROWSPAN=<%= $rowspan %>><%= $plandata %></TD>
 
 <%
-  my($pkg_svc);
   my($n)="";
-  foreach $pkg_svc ( @pkg_svc ) {
+  foreach my $pkg_svc ( @pkg_svc ) {
     my($svcpart)=$pkg_svc->getfield('svcpart');
     my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
     print $n,qq!<TD><A HREF="${p}edit/part_svc.cgi?$svcpart">!,