X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Frate.cgi;h=1abfb0d321bffff13c1a887323ec845c3683e655;hb=3714fa41c5306981c9f500df13eea52c72d82545;hp=ce56768d18be7a223733bedad653a3f42701ca86;hpb=d6047391feb3236374e16fd73240d9821d77fe06;p=freeside.git

diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index ce56768d1..1abfb0d32 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -1,102 +1,75 @@
-<%
-
-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 = (
-  '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(
-      'Main Menu' => $p,
+<% include("/elements/header.html","$action Rate plan", menubar(
       'View all rate plans' => "${p}browse/rate.cgi",
     ))
 %>
 
-<%= include('/elements/progress-init.html',
+<% include('/elements/progress-init.html',
               'OneTrueForm',
-              [ 'rate', 'min_', 'sec_' ],
+              [ 'rate', 'preserve_rate_detail' ], # 'rate', 'min_', 'sec_' ],
               'process/rate.cgi',
               $p.'browse/rate.cgi',
            )
 %>
 <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() %>
-<TR>
-  <TH>Region</TH>
-  <TH>Prefix(es)</TH>
-  <TH><FONT SIZE=-1>Included<BR>minutes</FONT></TH>
-  <TH><FONT SIZE=-1>Charge per<BR>minute</FONT></TH>
-  <TH><FONT SIZE=-1>Granularity</FONT></TH>
-</TR>
+<INPUT TYPE="hidden" NAME="preserve_rate_detail" VALUE="1">
 
-<% 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>
-      <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>
-<% } %>
+<INPUT NAME="submit" TYPE="button" VALUE="<% 
+  $rate->ratenum ? "Apply changes" : "Add rate plan"
+%>" onClick="document.OneTrueForm.submit.disabled=true; process();">
+</FORM>
 
-<TR>
-  <TD COLSPAN=5 ALIGN="center">
-    <A HREF="<%=$p%>edit/rate_region.cgi"><I>Add a region</I></A>
-  </TD>
-</TR>
+% if($rate->ratenum) {
+<BR><BR><FONT SIZE="+2">Rates in this plan</FONT>
+% 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)',
+% ) ) {
+<FORM ACTION="<%$cgi->url%>" METHOD="GET">
+<INPUT TYPE="hidden" NAME="ratenum" VALUE="<% $rate->ratenum %>">
+<INPUT TYPE="hidden" NAME="countrycode" VALUE="<% $countrycode %>">
+<FONT SIZE="+1">Usage type: <% $select_cdr_type %></FONT>
+</FORM>
+% }
 
-</TABLE>
+<% include('/edit/elements/rate_detail.html',
+            'ratenum'     => $rate->ratenum,
+            'countrycode' => $countrycode,
+            'cdrtypenum'  => $cdrtypenum,
+) %>
+% }
 
-<BR><INPUT NAME="submit" TYPE="button" VALUE="<%= 
-  $rate->ratenum ? "Apply changes" : "Add rate plan"
-%>" onClick="document.OneTrueForm.submit.disabled=true; process();">
+<% include('/elements/footer.html') %>
+
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my $rate;
+if ( $cgi->param('ratenum') ) {
+  $cgi->param('ratenum') =~ /^(\d+)$/;
+  $rate = qsearchs( 'rate', { 'ratenum' => $1 } );
+} else { #adding
+  $rate = new FS::rate {};
+}
+my $action = $rate->ratenum ? 'Edit' : 'Add';
 
-    </FORM>
-  </BODY>
-</HTML>
+my $countrycode = '';
+if ( $cgi->param('countrycode') =~ /^(\d+)$/ ) {
+  $countrycode = $1;
+}
 
+my $cdrtypenum = '';
+if ( $cgi->param('cdrtypenum') =~ /^(\d+)$/ ) {
+  $cdrtypenum = $1;
+}
+</%init>