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_region.pm
diff --git
a/FS/FS/rate_region.pm
b/FS/FS/rate_region.pm
index
65dfd2a
..
d42fdb4
100644
(file)
--- a/
FS/FS/rate_region.pm
+++ b/
FS/FS/rate_region.pm
@@
-36,7
+36,10
@@
inherits from FS::Record. The following fields are currently supported:
=item regionnum - primary key
=item regionnum - primary key
-=item regionname
+=item regionname - name of the region
+
+=item exact_match - 'Y' if "prefixes" in this region really represent
+complete phone numbers. Null if they represent prefixes (the usual case).
=back
=back
@@
-233,6
+236,7
@@
sub check {
my $error =
$self->ut_numbern('regionnum')
|| $self->ut_text('regionname')
my $error =
$self->ut_numbern('regionnum')
|| $self->ut_text('regionname')
+ || $self->ut_flag('exact_match')
;
return $error if $error;
;
return $error if $error;
@@
-248,6
+252,7
@@
Returns all prefixes (see L<FS::rate_prefix>) for this region.
sub rate_prefix {
my $self = shift;
sub rate_prefix {
my $self = shift;
+ map { $_ } #return $self->num_rate_prefix unless wantarray;
sort { $a->countrycode cmp $b->countrycode
or $a->npa cmp $b->npa
or $a->nxx cmp $b->nxx
sort { $a->countrycode cmp $b->countrycode
or $a->npa cmp $b->npa
or $a->nxx cmp $b->nxx
@@
-264,7
+269,7
@@
destionation.
sub dest_detail {
my $self = shift;
sub dest_detail {
my $self = shift;
- qsearch( 'rate_detail', { 'dest_regionnum' => $self->regionnum
,
} );
+ qsearch( 'rate_detail', { 'dest_regionnum' => $self->regionnum } );
}
=item prefixes_short
}
=item prefixes_short
@@
-287,11
+292,13
@@
sub prefixes_short {
}
my $npa = $rate_prefix->npa;
if ( $countrycode eq '1' ) {
}
my $npa = $rate_prefix->npa;
if ( $countrycode eq '1' ) {
- $out .= '('. substr( $npa, 0, 3 ). ')';
+ #$out .= '('. substr( $npa, 0, 3 ). ')';
+ $out .= substr( $npa, 0, 3 );
$out .= ' '. substr( $npa, 3 ) if length($npa) > 3;
} else {
$out .= $rate_prefix->npa;
}
$out .= ' '. substr( $npa, 3 ) if length($npa) > 3;
} else {
$out .= $rate_prefix->npa;
}
+ $out .= '-'. $rate_prefix->nxx if $rate_prefix->nxx;
$out .= ', ';
}
$out =~ s/, $//;
$out .= ', ';
}
$out =~ s/, $//;