Will things ever be the same again?

[freeside.git] / httemplate / edit / rate.cgi

diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index 9aa4e72..72a04c3 100644 (file)
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -1,40 +1,41 @@
-<%
-
-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(
+%
+%
+%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",
     ))
 %>
 
-<%= include('/elements/progress-init.html',
+<% include('/elements/progress-init.html',
               'OneTrueForm',
               [ 'rate', 'min_', 'sec_' ],
               'process/rate.cgi',
@@ -42,13 +43,13 @@ my %granularity = (
            )
 %>
 <FORM NAME="OneTrueForm">
-<INPUT TYPE="hidden" NAME="ratenum" VALUE="<%= $rate->ratenum %>">
+<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>
@@ -56,54 +57,56 @@ Rate plan
   <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 (
-     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'
-                              };
-%>
 
   <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="button" VALUE="<%= 
+<BR><INPUT NAME="submit" TYPE="button" VALUE="<% 
   $rate->ratenum ? "Apply changes" : "Add rate plan"
 %>" onClick="document.OneTrueForm.submit.disabled=true; process();">