X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Frate_region.cgi;h=b50d2daba8e60b362512f5ed1ba1518e350f8fae;hb=01721976fa3324f41a3093cda68bc38a7eec5ff5;hp=cc14dd37dc0c36df9dca6618a738e3719dd01acb;hpb=673b9a458d9138523026963df6fa3b4683e09bae;p=freeside.git
diff --git a/httemplate/edit/rate_region.cgi b/httemplate/edit/rate_region.cgi
index cc14dd37d..b50d2daba 100644
--- a/httemplate/edit/rate_region.cgi
+++ b/httemplate/edit/rate_region.cgi
@@ -1,15 +1,103 @@
-
-<%
+<% include("/elements/header.html","$action Region", menubar(
+ 'View all regions' => "${p}browse/rate_region.html",
+ ))
+%>
+
+<% include('/elements/error.html') %>
+
+
+%# rate plan info, if the region has been created yet
+
+% if($rate_region->regionnum) {
+
Rates in this region
+% if ( my $select_cdr_type = include('/elements/select-cdr_type.html',
+% 'curr_value' => $cdrtypenum,
+% 'onchange' => 'form.submit();',
+% 'name_col' => 'cdrtypename',
+% 'value_col' => 'cdrtypenum',
+% 'empty_label' => '(default)',
+% ) ) {
+
+% }
+<% include('/edit/elements/rate_detail.html',
+ 'regionnum' => $rate_region->regionnum,
+ 'cdrtypenum' => $cdrtypenum,
+) %>
+% }
+
+<% include('/elements/footer.html') %>
+<%once>
+
+tie my %conn_secs, 'Tie::IxHash', FS::rate_detail::conn_secs();
+
+%once>
+<%init>
+
+die "access denied"
+ unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
my $rate_region;
if ( $cgi->param('error') ) {
$rate_region = new FS::rate_region ( {
map { $_, scalar($cgi->param($_)) } fields('rate_region')
} );
-} elsif ( $cgi->keywords ) {
- my($query) = $cgi->keywords;
- $query =~ /^(\d+)$/;
- $rate_region = qsearchs( 'rate_region', { 'regionnum' => $1 } );
+} elsif ( $cgi->param('regionnum') ) {
+ $cgi->param('regionnum') =~ /^(\d+)$/ or die "unparseable regionnum";
+ $rate_region = qsearchs( 'rate_region', { 'regionnum' => $1 } )
+ or die "unknown regionnum $1\n";
} else { #adding
$rate_region = new FS::rate_region {};
}
@@ -17,98 +105,19 @@ my $action = $rate_region->regionnum ? 'Edit' : 'Add';
my $p1 = popurl(1);
-my %granularity = (
- '6' => '6 second',
- '60' => 'minute',
-);
+tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
my @rate_prefix = $rate_region->rate_prefix;
my $countrycode = '';
if ( @rate_prefix ) {
$countrycode = $rate_prefix[0]->countrycode;
foreach my $rate_prefix ( @rate_prefix ) {
- eidiot 'multiple country codes per region not yet supported by web UI'
+ errorpage('multiple country codes per region not yet supported by web UI')
unless $rate_prefix->countrycode eq $countrycode;
}
}
-
-%>
-
-<%= header("$action Region", menubar(
- 'Main Menu' => $p,
- #'View all regions' => "${p}browse/rate_region.cgi",
- ))
-%>
-
-<% if ( $cgi->param('error') ) { %>
-Error: <%= $cgi->param('error') %>
-<% } %>
-
-
-