projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
rate_detail.pm
diff --git
a/FS/FS/rate_detail.pm
b/FS/FS/rate_detail.pm
index
918134a
..
d81d9db
100644
(file)
--- a/
FS/FS/rate_detail.pm
+++ b/
FS/FS/rate_detail.pm
@@
-1,14
+1,13
@@
package FS::rate_detail;
package FS::rate_detail;
+use base qw(FS::Record);
use strict;
use strict;
-use vars qw( @ISA $DEBUG $me );
+use vars qw( $DEBUG $me );
+use Tie::IxHash;
use FS::Record qw( qsearch qsearchs dbh );
use FS::rate;
use FS::rate_region;
use FS::rate_time;
use FS::Record qw( qsearch qsearchs dbh );
use FS::rate;
use FS::rate_region;
use FS::rate_time;
-use Tie::IxHash;
-
-@ISA = qw(FS::Record);
$DEBUG = 0;
$me = '[FS::rate_detail]';
$DEBUG = 0;
$me = '[FS::rate_detail]';
@@
-59,6
+58,8
@@
inherits from FS::Record. The following fields are currently supported:
=item cdrtypenum - CDR type (see L<FS::cdr_type>) if any for this rate
=item cdrtypenum - CDR type (see L<FS::cdr_type>) if any for this rate
+=item region_group - Group in region group for rate plan
+
=back
=head1 METHODS
=back
=head1 METHODS
@@
-128,11
+129,15
@@
sub check {
#|| $self->ut_money('min_charge')
#good enough for now...
#|| $self->ut_money('min_charge')
#good enough for now...
+ || $self->ut_floatn('conn_charge')
+ || $self->ut_floatn('conn_cost')
|| $self->ut_float('min_charge')
|| $self->ut_float('min_charge')
+ || $self->ut_floatn('min_cost')
|| $self->ut_number('sec_granularity')
|| $self->ut_foreign_keyn('classnum', 'usage_class', 'classnum' )
|| $self->ut_number('sec_granularity')
|| $self->ut_foreign_keyn('classnum', 'usage_class', 'classnum' )
+ || $self->ut_enum('region_group', [ '', 'Y' ])
;
return $error if $error;
;
return $error if $error;
@@
-144,13
+149,6
@@
sub check {
Returns the parent call plan (see L<FS::rate>) associated with this call plan
rate.
Returns the parent call plan (see L<FS::rate>) associated with this call plan
rate.
-=cut
-
-sub rate {
- my $self = shift;
- qsearchs('rate', { 'ratenum' => $self->ratenum } );
-}
-
=item orig_region
Returns the origination region (see L<FS::rate_region>) associated with this
=item orig_region
Returns the origination region (see L<FS::rate_region>) associated with this