X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpkg_svc.pm;h=5c6070303e920c9ac6da69de425b3b74a83a3f88;hp=d64d10db2be6c7429957cf7c6d5519ee7dba25f1;hb=dc83512c36dc6bea2585abada4f88d714c600e55;hpb=0e8861ca6b3b04b99ea9477e8c1555561b21c929

diff --git a/FS/FS/pkg_svc.pm b/FS/FS/pkg_svc.pm
index d64d10db2..5c6070303 100644
--- a/FS/FS/pkg_svc.pm
+++ b/FS/FS/pkg_svc.pm
@@ -1,12 +1,18 @@
 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 +45,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 +54,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
@@ -67,24 +81,8 @@ otherwise returns false.
 
 =item delete
 
-Deletes this record from the database.  If this svcpart is also the default svcpart,
-we set part_pkg.def_svcpart to NULL.  If there is an error, returns the error,
-otherwise returns false.
-
-sub delete {
-  my $self = shift;
-  my $part_pkg = qsearchs( 'part_pkg', { pkgpart => $self->pkgpart } );
-
-  # Should this be wrapped in a transaction?
-  if ( $part_pkg->def_svcpart == $self->svcpart ) {
-    my $new = new FS::part_pkg $part_pkg->hash;
-    $new->def_svcpart = 0;
-    my $error = $new->replace($part_pkg);
-    return $error if $error;
-  }
-
-  $self->SUPER::delete;
-}
+Deletes this record from the database.  If there is an error, returns the
+error, otherwise returns false.
 
 =item replace OLD_RECORD
 
@@ -94,21 +92,13 @@ 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;
 
-  my $part_pkg = qsearchs( 'part_pkg', { pkgpart => $new->pkgpart } );
-
-  # Should this be wrapped in a transaction?
-  if ( ($part_pkg->def_svcpart == $new->svcpart) && ($new->quantity == 0) ) {
-    my $new_part_pkg = new FS::part_pkg $part_pkg->hash;
-    $new_part_pkg->def_svcpart = 0;
-    my $error = $new_part_pkg->replace($part_pkg);
-    return $error if $error;
-  }
-
   $new->SUPER::replace($old);
 }
 
@@ -125,29 +115,30 @@ 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>).
@@ -156,15 +147,12 @@ 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 } );
 }
 
 =back
 
-=head1 VERSION
-
-$Id: pkg_svc.pm,v 1.2 2002-06-08 07:48:37 khoff Exp $
-
 =head1 BUGS
 
 =head1 SEE ALSO