X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpkg_svc.pm;h=b2dc870424f61efec3a7d7dd91f5de1f20515b69;hb=41aef8bd93f7cc3a39056a8fd997d3072dfcdf8a;hp=3c544ffd8630ae715fc5f7e409e96dcaeb17c32b;hpb=3162b06a6d3be9ddf4daea2c29cd94516ac40f68;p=freeside.git

diff --git a/FS/FS/pkg_svc.pm b/FS/FS/pkg_svc.pm
index 3c544ffd8..b2dc87042 100644
--- a/FS/FS/pkg_svc.pm
+++ b/FS/FS/pkg_svc.pm
@@ -1,12 +1,7 @@
 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 );
 
 =head1 NAME
 
@@ -39,6 +34,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>)
@@ -46,6 +43,12 @@ FS::Record.  The following fields are currently supported:
 =item quantity - Quantity of this service definition that this billing item
 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
@@ -78,7 +81,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;
@@ -99,46 +104,36 @@ 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;
 
   return "Unknown pkgpart!" unless $self->part_pkg;
   return "Unknown svcpart!" unless $self->part_svc;
 
-  ''; #no error
+  if ( $self->dbdef_table->column('primary_svc') ) {
+    $error = $self->ut_enum('primary_svc', [ '', 'Y' ] );
+    return $error if $error;
+  }
+
+  $self->SUPER::check;
 }
 
 =item part_pkg
 
 Returns the FS::part_pkg object (see L<FS::part_pkg>).
 
-=cut
-
-sub part_pkg {
-  my $self = shift;
-  qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
-}
-
 =item part_svc
 
 Returns the FS::part_svc object (see L<FS::part_svc>).
 
-=cut
-
-sub part_svc {
-  my $self = shift;
-  qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
-}
-
 =back
 
-=head1 VERSION
-
-$Id: pkg_svc.pm,v 1.3 2002-06-10 01:39:50 khoff Exp $
-
 =head1 BUGS
 
 =head1 SEE ALSO