-<%
-
-my($rate, $error);
-
-if ( $cgi->param('magic') eq 'process' ) {
-
- my $ratenum = $cgi->param('ratenum');
-
- my $old = qsearchs('rate', { 'ratenum' => $ratenum } ) if $ratenum;
-
- my @rate_detail = map {
- my $regionnum = $_->regionnum;
- if ( $cgi->param("sec_granularity$regionnum") ) {
- new FS::rate_detail {
- 'dest_regionnum' => $regionnum,
- map { $_ => scalar($cgi->param("$_$regionnum")) }
- qw( min_included min_charge sec_granularity )
- };
- } else {
- new FS::rate_detail {
- 'dest_regionnum' => $regionnum,
- 'min_included' => 0,
- 'min_charge' => 0,
- 'sec_granularity' => '60'
- };
- }
- } qsearch('rate_region', {} );
-
- $rate = new FS::rate ( {
- map {
- $_, scalar($cgi->param($_));
- } fields('rate')
- } );
-
- if ( $ratenum ) {
- warn "$rate replacing $old ($ratenum)\n";
- $error = $rate->replace($old, 'rate_detail' => \@rate_detail );
- } else {
- warn "inserting $rate\n";
- $error = $rate->insert( 'rate_detail' => \@rate_detail );
- $ratenum = $rate->getfield('ratenum');
- }
-
- unless ( $error ) {
- print $cgi->redirect("${p}browse/rate.cgi");
- myexit;
- }
-
-} elsif ( $cgi->keywords ) {
- my($query) = $cgi->keywords;
- $query =~ /^(\d+)$/;
- $rate = qsearchs( 'rate', { 'ratenum' => $1 } );
-} else { #adding
- $rate = new FS::rate {};
-}
-my $action = $rate->ratenum ? 'Edit' : 'Add';
-
-my $p1 = popurl(1);
-
-my %granularity = (
- '6' => '6 second',
- '60' => 'minute',
-);
-
-my $nous = <<END;
- WHERE 0 < ( SELECT COUNT(*) FROM rate_prefix
- WHERE rate_region.regionnum = rate_prefix.regionnum
- AND countrycode != '1'
- )
-END
-
-%>
-
-<%= header("$action Rate plan", menubar(
+%
+%
+%my $rate;
+%if ( $cgi->keywords ) {
+% my($query) = $cgi->keywords;
+% $query =~ /^(\d+)$/;
+% $rate = qsearchs( 'rate', { 'ratenum' => $1 } );
+%} else { #adding
+% $rate = new FS::rate {};
+%}
+%my $action = $rate->ratenum ? 'Edit' : 'Add';
+%
+%my $p1 = popurl(1);
+%
+%my %granularity = (
+% '1', => '1 second',
+% '6' => '6 second',
+% '30' => '30 second', # '1/2 minute',
+% '60' => 'minute',
+%);
+%
+%#my $nous = <<END;
+%# WHERE 0 < ( SELECT COUNT(*) FROM rate_prefix
+%# WHERE rate_region.regionnum = rate_prefix.regionnum
+%# AND countrycode != '1'
+%# )
+%#END
+%
+%
+
+
+<% include("/elements/header.html","$action Rate plan", menubar(
'Main Menu' => $p,
'View all rate plans' => "${p}browse/rate.cgi",
))
%>
-<% if ( $error ) { %>
-<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $error %></FONT><BR>
-<% } %>
-
-<FORM ACTION="<%=$p1%>rate.cgi" NAME="OneTrueForm" METHOD=POST onSubmit="document.OneTrueForm.submit.disabled=true">
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
-<INPUT TYPE="hidden" NAME="ratenum" VALUE="<%= $rate->ratenum %>">
+<% include('/elements/progress-init.html',
+ 'OneTrueForm',
+ [ 'rate', 'min_', 'sec_' ],
+ 'process/rate.cgi',
+ $p.'browse/rate.cgi',
+ )
+%>
+<FORM NAME="OneTrueForm">
+<INPUT TYPE="hidden" NAME="ratenum" VALUE="<% $rate->ratenum %>">
Rate plan
-<INPUT TYPE="text" NAME="ratename" SIZE=32 VALUE="<%= $rate->ratename %>">
+<INPUT TYPE="text" NAME="ratename" SIZE=32 VALUE="<% $rate->ratename %>">
<BR><BR>
-<%= table() %>
+<% table() %>
<TR>
<TH>Region</TH>
<TH>Prefix(es)</TH>
<TH><FONT SIZE=-1>Charge per<BR>minute</FONT></TH>
<TH><FONT SIZE=-1>Granularity</FONT></TH>
</TR>
+% foreach my $rate_region (
+% sort { lc($a->regionname) cmp lc($b->regionname) }
+% qsearch({
+% 'select' => 'DISTINCT ON ( regionnum ) rate_region.*',
+% 'table' => 'rate_region',
+% 'hashref' => {},
+% #'addl_from' => 'INNER JOIN rate_prefix USING ( regionnum )',
+% #'extra_sql' => "WHERE countrycode != '1'",
+%
+% # 'ORDER BY regionname'
+% # ERROR: SELECT DISTINCT ON expressions must
+% # match initial ORDER BY expressions
+% })
+% ) {
+% my $n = $rate_region->regionnum;
+% my $rate_detail =
+% $rate->dest_detail($rate_region)
+% || new FS::rate_detail { 'min_included' => 0,
+% 'min_charge' => 0,
+% 'sec_granularity' => '60'
+% };
+%
+
-<% foreach my $rate_region (
- qsearch( 'rate_region',
- {},
- '',
- "$nous ORDER BY regionname",
- )
- ) {
- my $n = $rate_region->regionnum;
- my $rate_detail =
- $rate->dest_detail($rate_region)
- || new FS::rate_detail { 'min_included' => 0,
- 'min_charge' => 0,
- 'sec_granularity' => '60'
- };
-%>
<TR>
- <TD><A HREF="<%=$p%>edit/rate_region.cgi?<%= $rate_region->regionnum %>"><%= $rate_region->regionname %></A></TD>
- <TD><%= $rate_region->prefixes_short %></TD>
- <TD><INPUT TYPE="text" SIZE=5 NAME="min_included<%=$n%>" VALUE="<%= $cgi->param("min_included$n") || $rate_detail->min_included %>"></TD>
- <TD>$<INPUT TYPE="text" SIZE=4 NAME="min_charge<%=$n%>" VALUE="<%= sprintf('%.2f', $cgi->param("min_charge$n") || $rate_detail->min_charge ) %>"></TD>
+ <TD><A HREF="<%$p%>edit/rate_region.cgi?<% $rate_region->regionnum %>"><% $rate_region->regionname %></A></TD>
+ <TD><% $rate_region->prefixes_short %></TD>
+ <TD><INPUT TYPE="text" SIZE=5 NAME="min_included<%$n%>" VALUE="<% $cgi->param("min_included$n") || $rate_detail->min_included %>"></TD>
+ <TD>$<INPUT TYPE="text" SIZE=4 NAME="min_charge<%$n%>" VALUE="<% sprintf('%.2f', $cgi->param("min_charge$n") || $rate_detail->min_charge ) %>"></TD>
<TD>
- <SELECT NAME="sec_granularity<%=$n%>">
- <% foreach my $granularity ( keys %granularity ) { %>
- <OPTION VALUE="<%=$granularity%>"<%= $granularity == ( $cgi->param("sec_granularity$n") || $rate_detail->sec_granularity ) ? ' SELECTED' : '' %>><%=$granularity{$granularity}%>
- <% } %>
+ <SELECT NAME="sec_granularity<%$n%>">
+% foreach my $granularity ( keys %granularity ) {
+
+ <OPTION VALUE="<%$granularity%>"<% $granularity == ( $cgi->param("sec_granularity$n") || $rate_detail->sec_granularity ) ? ' SELECTED' : '' %>><%$granularity{$granularity}%>
+% }
+
</SELECT>
</TR>
-<% } %>
+% }
+
<TR>
<TD COLSPAN=5 ALIGN="center">
- <A HREF="<%=$p%>edit/rate_region.cgi"><I>Add a region</I></A>
+ <A HREF="<%$p%>edit/rate_region.cgi"><I>Add a region</I></A>
</TD>
</TR>
</TABLE>
-<BR><INPUT NAME="submit" TYPE="submit" VALUE="<%=
+<BR><INPUT NAME="submit" TYPE="button" VALUE="<%
$rate->ratenum ? "Apply changes" : "Add rate plan"
-%>">
-Please be patient, <%= $rate->ratenum ? 'editing' : 'adding' %>
-a rate plan can take a few minutes...
+%>" onClick="document.OneTrueForm.submit.disabled=true; process();">
</FORM>
</BODY>