X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Frate_detail.html;h=aef550513ee3c502ba32bbfa84cf7e62149b1940;hb=9bdca2fe23584918219395b62effbb9ef0fc5f1c;hp=23bc23ff89cbddf55aeb4c0cd427173e39cc4bd0;hpb=63a268637b2d51a8766412617724b9436439deb6;p=freeside.git
diff --git a/httemplate/browse/rate_detail.html b/httemplate/browse/rate_detail.html
index 23bc23ff8..aef550513 100644
--- a/httemplate/browse/rate_detail.html
+++ b/httemplate/browse/rate_detail.html
@@ -1,64 +1,21 @@
-<% include( 'elements/browse.html',
- 'title' => $title,
- 'name_singular' => 'rate',
- 'html_init' => $html_init,
- 'menubar' => [ 'Rate plans' => $p.'browse/rate.cgi' ],
- 'query' => {
- 'table' => 'rate_detail',
- 'addl_from' => $join,
- 'hashref' => { 'ratenum' => $ratenum },
- 'extra_sql' => $where,
- },
- 'count_query' => "SELECT COUNT(*) FROM rate_detail $join".
- " WHERE ratenum = $ratenum $where",
- 'header' => [
- 'Region',
- 'Prefix(es)',
- 'Included
minutes',
- 'Charge per
minute',
- 'Granularity',
- 'Usage class',
- ],
- 'fields' => [
- 'regionname',
- sub { shift->dest_region->prefixes_short },
- sub { shift->min_included.
- ' (edit)';
- },
- sub { $money_char. shift->min_charge.
- ' (edit)';
- },
- sub { $granularity{ shift->sec_granularity } },
- 'classname',
- ],
- 'links' => [ '', '', $edit_link, $edit_link, '', '' ],
- 'link_onclicks' => [ '', '', $edit_onclick, $edit_onclick, '', '' ],
- 'align' => 'llrrcc',
- )
-%>
-<%once>
+<% include('/elements/init_overlib.html') %>
+<% include('/elements/header.html',$title) %>
+<% include('/elements/menubar.html',@menubar) %>
+<% include('/edit/elements/rate_detail.html',
+ 'ratenum' => $ratenum,
+ 'countrycode' => $countrycode,
+) %>
+<% include('/elements/footer.html') %>
-tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
+<%once>
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
-my $join =
- ' JOIN rate_region ON ( rate_detail.dest_regionnum = rate_region.regionnum )';
-
-my $edit_link = [ 'javascript:void(0);', sub { ''; } ];
-
-my $edit_onclick = sub {
- my $rate_detail = shift;
- my $ratedetailnum = $rate_detail->ratedetailnum;
- include( '/elements/popup_link_onclick.html',
- 'action' => "${p}edit/rate_detail.html?$ratedetailnum",
- 'actionlabel' => 'Edit rate',
- 'height' => 420,
- #default# 'width' => 540,
- #default# 'color' => '#333399',
- );
-};
+my @menubar = ( 'Rate plans' => $p.'browse/rate.cgi',
+ 'Regions and Prefixes' => $p.'browse/rate_region.html',
+ 'Time Periods' => $p.'browse/rate_time.html',
+ );
%once>
<%init>
@@ -66,8 +23,6 @@ my $edit_onclick = sub {
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
-my $html_init = include('/elements/init_overlib.html');
-
$cgi->param('ratenum') =~ /^(\d+)$/ or die "unparsable ratenum";
my $ratenum = $1;
my $rate = qsearchs('rate', { 'ratenum' => $ratenum } )
@@ -75,18 +30,11 @@ my $rate = qsearchs('rate', { 'ratenum' => $ratenum } )
my $ratename = $rate->ratename;
my $title = "$ratename rates";
-my @where = ();
-
+my $where;
+my $countrycode = '';
if ( $cgi->param('countrycode') =~ /^(\d+)$/ ) {
- my $countrycode = $1;
- push @where, "0 < ( SELECT COUNT(*) FROM rate_prefix
- WHERE rate_prefix.regionnum = rate_region.regionnum
- AND countrycode = '$countrycode'
- )
- ";
+ $countrycode = $1;
$title .= " for +$countrycode";
}
-my $where = scalar(@where) ? ' AND '.join(' AND ', @where ) : '';
-
%init>