X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fbrowse%2Frate_region.html;h=962841d914be4636a054a84618660cb64b30a53d;hb=8dd41f364aaba88969dfd0908feb22709025e7f6;hp=456ba34522081c2d97351a82a5568784133f46f0;hpb=ce022f46d74bc76ef228eafa094251e31dafaf97;p=freeside.git
diff --git a/httemplate/browse/rate_region.html b/httemplate/browse/rate_region.html
index 456ba3452..962841d91 100644
--- a/httemplate/browse/rate_region.html
+++ b/httemplate/browse/rate_region.html
@@ -15,13 +15,15 @@
'header' => \@header,
'fields' => \@fields,
'links' => \@links,
+ 'align' => \@align,
+ 'xls_format' => \@xls_format,
)
%>
<%once>
my $edit_url = $p.'edit/rate_region.cgi';
-my $link = [ "$edit_url?", 'regionnum' ];
+my $link = [ "$edit_url?regionnum=", 'regionnum' ];
my $html_init =
'Regions and prefixes for VoIP and call billing.
'.
@@ -39,12 +41,12 @@ if ( driver_name =~ /^Pg/ ) {
" ELSE npa || '-' || nxx ".
" END";
my $prefixes_sql = "SELECT $prefix_sql $fromwhere AND npa IS NOT NULL";
- $select .= "( SELECT countrycode $fromwhere LIMIT 1 ) AS ccode,
+ $select .= "( SELECT '+'||countrycode $fromwhere LIMIT 1 ) AS ccode,
ARRAY_TO_STRING( ARRAY($prefixes_sql), ', ' ) AS prefixes";
} elsif ( driver_name =~ /^mysql/i ) {
$join = 'LEFT JOIN rate_prefix USING ( regionnum )';
- $select .= "GROUP_CONCAT( DISTINCT countrycode ) AS ccode,
- GROUP_CONCAT( npa ORDER BY npa ) AS prefixes ";
+ $select .= "'+'||GROUP_CONCAT( DISTINCT countrycode ) AS ccode,
+ GROUP_CONCAT( npa ORDER BY npa SEPARATOR ', ' ) AS prefixes ";
$group_sql = 'GROUP BY regionnum, regionname';
} else {
die 'unknown database '. driver_name;
@@ -60,9 +62,17 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
-my @header = ( '#', 'Region', 'Country code', 'Prefixes' );
-my @fields = ( 'regionnum', 'regionname', 'ccode', 'prefixes' );
-my @links = ( $link, $link, $link, $link );
+my $sub_prefixes = sub {
+ my $region = shift;
+ $region->prefixes .
+ ($region->exact_match ? ' (exact match only)' : '');
+};
+
+my @header = ( '#', 'Region', 'Country code', 'Prefixes' );
+my @fields = ( 'regionnum', 'regionname', 'ccode', $sub_prefixes );
+my @links = ( ($link) x 4 );
+my @align = ( 'right', 'left', 'right', 'left' );
+my @xls_format = ( ({ locked=>1, bg_color=>22 }) x 4 );
$cgi->param('dummy', 1);
my $countrycode_filter_change =
@@ -86,8 +96,9 @@ sub _rate_detail_factory {
my( $rate, $field ) = @_;
return sub {
my $rate_detail = $rate->dest_detail(shift)
- || new FS::rate_region { 'min_included' => 0,
+ || new FS::rate_detail { 'min_included' => 0,
'min_charge' => 0,
+ 'min_cost' => 0,
'sec_granularity' => 0,
};
my $value = $rate_detail->$field();
@@ -110,7 +121,8 @@ if ( $cgi->param('show_rates') ) {
_rate_detail_factory($rate, 'sec_granularity'),
_rate_detail_factory($rate, 'classnum');
- push @links, '', '', '', '';
+ push @links, ( ('') x 4 );
+ push @xls_format, ( ({}) x 4 );
}