projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 83075 - fixed sorting by referrals error
[freeside.git]
/
FS
/
FS
/
pkg_svc.pm
diff --git
a/FS/FS/pkg_svc.pm
b/FS/FS/pkg_svc.pm
index
3c544ff
..
5c60703
100644
(file)
--- a/
FS/FS/pkg_svc.pm
+++ b/
FS/FS/pkg_svc.pm
@@
-1,12
+1,18
@@
package FS::pkg_svc;
package FS::pkg_svc;
+use base qw(FS::Record);
use strict;
use strict;
-use vars qw( @ISA );
use FS::Record qw( qsearchs );
use FS::Record qw( qsearchs );
-use FS::part_pkg;
use FS::part_svc;
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
=head1 NAME
@@
-39,6
+45,8
@@
FS::Record. The following fields are currently supported:
=over 4
=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>)
=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 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
=back
=head1 METHODS
@@
-78,7
+92,9
@@
returns the error, otherwise returns false.
=cut
sub replace {
=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;
return "Can't change pkgpart!" if $old->pkgpart != $new->pkgpart;
return "Can't change svcpart!" if $old->svcpart != $new->svcpart;
@@
-99,29
+115,30
@@
sub check {
my $error;
$error =
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_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;
;
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>).
}
=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>).
=item part_svc
Returns the FS::part_svc object (see L<FS::part_svc>).
@@
-130,15
+147,12
@@
Returns the FS::part_svc object (see L<FS::part_svc>).
sub part_svc {
my $self = shift;
sub part_svc {
my $self = shift;
+ return $self->{_svcpart} if $self->{_svcpart};
qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
}
=back
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
=head1 BUGS
=head1 SEE ALSO