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

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index ffa0d87..8d5b554 100755 (executable)
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -144,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">!,

diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index 5f0e6bf..a20149a 100755 (executable)
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -104,8 +104,9 @@ unless ($cancel) {
 
   #list of services this pkgpart includes
   my $pkg_svc;
-  my %pkg_svc = ();
-  foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $cust_pkg->pkgpart }) ) {
+  my %pkg_svc;
+  #foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $cust_pkg->pkgpart }) ) {
+  foreach $pkg_svc ( $cust_pkg->part_pkg->pkg_svc ) {
     $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity if $pkg_svc->quantity;
   }