diff options
Diffstat (limited to 'httemplate/browse')
| -rw-r--r-- | httemplate/browse/rate.cgi | 20 | ||||
| -rw-r--r-- | httemplate/browse/rate_region.html | 24 |
2 files changed, 36 insertions, 8 deletions
diff --git a/httemplate/browse/rate.cgi b/httemplate/browse/rate.cgi index ea59a0c5b..79bebadee 100644 --- a/httemplate/browse/rate.cgi +++ b/httemplate/browse/rate.cgi @@ -8,9 +8,9 @@ 'order_by' => 'ORDER BY ratenum', }, 'count_query' => $count_query, - 'header' => [ '#', 'Rate plan', 'Rates' ], - 'fields' => [ 'ratenum', 'ratename', $rates_sub ], - 'links' => [ $link, $link, '' ], + 'header' => \@header, + 'fields' => \@fields, + 'links' => \@links, 'agent_virt' => 1, 'agent_pos' => 1, 'agent_null_right' => 'Configuration', #'Edit global CDR rates', @@ -76,4 +76,18 @@ if ( $curuser->access_right('Configuration') ) { #, 'Edit global CDR rates') ) { ; } +my @header = (); +my @fields = (); +my @links = (); + +if ( FS::Record->scalar_sql('SELECT 1 FROM rate WHERE agent_rateid IS NOT NULL LIMIT 1') ) { + push @header, 'Legacy #'; + push @fields, 'agent_rateid'; + push @links, $link; +} + +push @header, 'Rate plan', 'Rates'; +push @fields, 'ratename', $rates_sub; +push @links, $link, ''; + </%init> diff --git a/httemplate/browse/rate_region.html b/httemplate/browse/rate_region.html index b872455ae..1b4fd498f 100644 --- a/httemplate/browse/rate_region.html +++ b/httemplate/browse/rate_region.html @@ -68,11 +68,25 @@ my $sub_prefixes = sub { ($region->exact_match ? ' <I>(exact match only)</I>' : ''); }; -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 ); +my @header = (); +my @fields = (); +my @links = (); +my @align = (); +my @xls_format = (); + +if ( FS::Record->scalar_sql('SELECT 1 FROM rate_region WHERE agent_regionid IS NOT NULL LIMIT 1') ) { + push @header, 'Legacy #'; + push @fields, 'agent_regionid'; + push @links, $link; + push @align, 'right'; + push @xls_format, { locked=>1, bg_color=>22}; +} + +push @header, 'Region', 'Country code', 'Prefixes'; +push @fields, 'regionname', 'ccode', $sub_prefixes; +push @links, ($link) x 3; +push @align, 'left', 'right', 'left'; +push @xls_format, ({ locked=>1, bg_color=>22 }) x 3; my $countrycode_filter_change = "window.location = '". |