diff options
author | Mark Wells <mark@freeside.biz> | 2014-10-10 16:36:07 -0700 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2014-10-10 16:36:07 -0700 |
commit | 83e442de6a041fa3b7580d53912eeb1490ddf47c (patch) | |
tree | 2dc9a967c5e26ec27b083ce40acea6b254b7a29b /FS/FS/rate.pm | |
parent | 2a26e4616da323e083c941e9a8c3d2b35377bc3f (diff) |
upstream-markup call rating and global default rates, #30633
Diffstat (limited to 'FS/FS/rate.pm')
-rw-r--r-- | FS/FS/rate.pm | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/FS/FS/rate.pm b/FS/FS/rate.pm index aef9d8bec..9a5b90546 100644 --- a/FS/FS/rate.pm +++ b/FS/FS/rate.pm @@ -46,6 +46,16 @@ Rate name Optional agent (see L<FS::agent>) for agent-virtualized rates. +=item default_detailnum + +Optional rate detail to apply when a call doesn't match any region in the +rate plan. If this is not set, the call will either be left unrated (though +it may still be processed under a different pricing addon package), or be +marked as 'skipped', or throw a fatal error, depending on the setting of +the 'ignore_unrateable' package option. + +=item + =back =head1 METHODS @@ -268,6 +278,7 @@ sub check { $self->ut_numbern('ratenum') || $self->ut_text('ratename') #|| $self->ut_foreign_keyn('agentnum', 'agent', 'agentnum') + || $self->ut_numbern('default_detailnum') ; return $error if $error; @@ -277,8 +288,8 @@ sub check { =item dest_detail REGIONNUM | RATE_REGION_OBJECTD | HASHREF Returns the rate detail (see L<FS::rate_detail>) for this rate to the -specificed destination, or the empty string if no rate can be found for -the given destination. +specificed destination. If no rate can be found, returns the default +rate if there is one, and an empty string otherwise. Destination can be specified as an FS::rate_detail object or regionnum (see L<FS::rate_detail>), or as a hashref containing the following keys: @@ -379,8 +390,8 @@ sub dest_detail { foreach (@details) { return $_ if $_->ratetimenum eq ''; } - # found nothing - return; + # if still nothing, return the global default rate for this plan + return $self->default_detail; } =item rate_detail @@ -389,6 +400,18 @@ Returns all region-specific details (see L<FS::rate_detail>) for this rate. =back +=item default_detail + +Returns the default rate detail, if there is one. + +=cut + +sub default_detail { + my $self = shift; + $self->default_detailnum ? + FS::rate_detail->by_key($self->default_detailnum) : '' +} + =head1 SUBROUTINES =over 4 |