X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Frate.cgi;h=f8f67f6c4b2ec5847b6a747c9b86eeeddee90830;hp=3443f81d4928580044f0216e07e2afd4dc737f48;hb=c1bb4ddb71147d0571bd301a6d8c452fdf0e1bc9;hpb=6cf964d0dc008621fb30fd2da28e2c44f29c6364

diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index 3443f81d4..f8f67f6c4 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -17,55 +17,28 @@ my %granularity = (
   '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",
     ))
 %>
 
-<!-- <FORM ACTION="<%=$p1%>rate.cgi" NAME="OneTrueForm" METHOD=POST onSubmit="document.OneTrueForm.submit.disabled=true"> -->
-
-<SCRIPT TYPE="text/javascript" SRC="../elements/jsrsClient.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript">
-function process () {
-  document.OneTrueForm.submit.disabled=true;
-
-  var Hash = new Array();
-  var x = 0;
-  var fieldName;
-  for (var i = 0; i<document.OneTrueForm.elements.length; i++) {
-    fieldName = document.OneTrueForm.elements[i].name;
-    if (    (fieldName.indexOf('rate') > -1)
-         || (fieldName.indexOf('min_') > -1) 
-         || (fieldName.indexOf('sec_') > -1) 
-       )
-    {
-        Hash[x++] = fieldName;
-        Hash[x++] = document.OneTrueForm.elements[i].value;
-    }
-  }
-
-  jsrsPOST = true;
-  jsrsExecute( 'process/rate.cgi', myCallback, 'process_rate', Hash );
-
-  function myCallback( jobnum ) {
-    var progressWindow = window.open('../../misc/progress.html?jobnum=' + jobnum + ';url=<%=$p%>browse/rate.cgi', 'progressWindow', 'toolbar=no,location=no,directories=no,scrollbars=no,menubar=no,status=no,width=420,height=128');
-    progressWindow.opener = self;
-    //progressWindow.opener = document;
-  }
-
-}
-</SCRIPT>
-
+<%= 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 %>">
 
@@ -83,11 +56,17 @@ 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 =
@@ -97,6 +76,7 @@ Rate plan
                                 '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>
@@ -109,6 +89,7 @@ Rate plan
         <% } %>
       </SELECT>
   </TR>
+
 <% } %>
 
 <TR>
@@ -122,9 +103,6 @@ Rate plan
 <BR><INPUT NAME="submit" TYPE="button" VALUE="<%= 
   $rate->ratenum ? "Apply changes" : "Add rate plan"
 %>" onClick="document.OneTrueForm.submit.disabled=true; process();">
-Please make sure to allow popups from this site in order to view the progress window.
-<!-- Please be patient, <%= $rate->ratenum ? 'editing' : 'adding' %>
-a rate plan can take a few minutes... -->
 
     </FORM>
   </BODY>