<%
-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 $rate;
+if ( $cgi->keywords ) {
my($query) = $cgi->keywords;
$query =~ /^(\d+)$/;
$rate = qsearchs( 'rate', { 'ratenum' => $1 } );
'60' => 'minute',
);
-my $nous = <<END;
- WHERE 0 < ( SELECT COUNT(*) FROM rate_prefix
- WHERE rate_region.regionnum = rate_prefix.regionnum
- AND countrycode != '1'
- )
-END
+#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(
+<%= 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">
+<%= 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
</TR>
<% foreach my $rate_region (
- qsearch( 'rate_region',
- {},
- '',
- "$nous ORDER BY regionname",
- )
+ sort { lc($a->regionname) cmp lc($b->regionname) }
+ qsearch({
+ 'select' => 'DISTINCT ON ( regionnum ) rate_region.*',
+ 'table' => 'rate_region',
+ 'addl_from' => 'INNER JOIN rate_prefix USING ( regionnum )',
+ 'hashref' => {},
+ '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 =
'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>
<% } %>
</SELECT>
</TR>
+
<% } %>
<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>