show account services in address block list too, RT#79825

[freeside.git] / FS / FS / pkg_svc.pm

diff --git a/FS/FS/pkg_svc.pm b/FS/FS/pkg_svc.pm
index ea52176..666d76b 100644 (file)
--- a/FS/FS/pkg_svc.pm
+++ b/FS/FS/pkg_svc.pm
@@ -1,12 +1,19 @@
 package FS::pkg_svc;
+use base qw(FS::Record);
 
 use strict;
-use vars qw( @ISA );
 use FS::Record qw( qsearchs );
 use FS::part_pkg;
 use FS::part_svc;
 
-@ISA = qw( FS::Record );
+our $cache_enabled = 0;
+
+sub _simplecache {
+  my( $self, $hashref ) = @_;
+  if ( $cache_enabled && $hashref->{'svc'} ) {
+    $self->{'_svcpart'} = FS::part_svc->new($hashref);
+  }
+}
 
 =head1 NAME
 
@@ -39,6 +46,8 @@ FS::Record.  The following fields are currently supported:
 
 =over 4
 
+=item pkgsvcnum - primary key
+
 =item pkgpart - Billing item definition (see L<FS::part_pkg>)
 
 =item svcpart - Service definition (see L<FS::part_svc>)
@@ -48,6 +57,10 @@ definition includes
 
 =item primary_svc - primary flag, empty or 'Y'
 
+=item hidden - 'Y' to hide this service on invoices, null otherwise.
+
+=item provision_hold - 'Y' to release package hold when all services marked with this are provisioned
+
 =back
 
 =head1 METHODS
@@ -80,7 +93,9 @@ returns the error, otherwise returns false.
 =cut
 
 sub replace {
-  my ( $new, $old ) = ( shift, shift );
+  my( $new, $old ) = ( shift, shift );
+
+  $old = $new->replace_old unless defined($old);
 
   return "Can't change pkgpart!" if $old->pkgpart != $new->pkgpart;
   return "Can't change svcpart!" if $old->svcpart != $new->svcpart;
@@ -101,9 +116,12 @@ sub check {
 
   my $error;
   $error =
-    $self->ut_number('pkgpart')
+       $self->ut_numbern('pkgsvcnum')
+    || $self->ut_number('pkgpart')
     || $self->ut_number('svcpart')
     || $self->ut_number('quantity')
+    || $self->ut_enum('hidden', [ '', 'Y' ] )
+    || $self->ut_flag('provision_hold')
   ;
   return $error if $error;
 
@@ -137,6 +155,7 @@ Returns the FS::part_svc object (see L<FS::part_svc>).
 
 sub part_svc {
   my $self = shift;
+  return $self->{_svcpart} if $self->{_svcpart};
   qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
 }