X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Frate.cgi;h=1abfb0d321bffff13c1a887323ec845c3683e655;hp=c44364da966166cfd1bb700cba150014314868f3;hb=75e11f1d1a5ced24496b5732e290f7762403feb8;hpb=eaad412e5e8b33958f7331ae4449786fb567230e

diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index c44364da9..1abfb0d32 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -1,43 +1,11 @@
-%
-%
-%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',
               'OneTrueForm',
-              [ 'rate', 'min_', 'sec_' ],
+              [ 'rate', 'preserve_rate_detail' ], # 'rate', 'min_', 'sec_' ],
               'process/rate.cgi',
               $p.'browse/rate.cgi',
            )
@@ -49,72 +17,59 @@ Rate plan
 <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>
-% foreach my $rate_region (
-%     #sort { lc($a->regionname) cmp lc($b->regionname) }
-%     qsearch({
-%               'table'     => 'rate_region',
-%               'hashref'   => {},
-%               'order_by'  => 'ORDER BY LOWER(regionname)',
-%
-%               #'select'    => 'DISTINCT ON ( regionnum ) rate_region.*',
-%               #...
-%               #'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
-%                              # also, DISTINCT ON is a Pg-ism
-%            })
-%   ) {
-%     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'
-%                              };
-%
+<INPUT TYPE="hidden" NAME="preserve_rate_detail" VALUE="1">
 
+<INPUT NAME="submit" TYPE="button" VALUE="<% 
+  $rate->ratenum ? "Apply changes" : "Add rate plan"
+%>" onClick="document.OneTrueForm.submit.disabled=true; process();">
+</FORM>
 
-  <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}%>
-% } 
+% 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>
+% }
 
-      </SELECT>
-  </TR>
-% } 
+<% include('/edit/elements/rate_detail.html',
+            'ratenum'     => $rate->ratenum,
+            'countrycode' => $countrycode,
+            'cdrtypenum'  => $cdrtypenum,
+) %>
+% }
 
+<% include('/elements/footer.html') %>
 
-<TR>
-  <TD COLSPAN=5 ALIGN="center">
-    <A HREF="<%$p%>edit/rate_region.cgi"><I>Add a region</I></A>
-  </TD>
-</TR>
+<%init>
 
-</TABLE>
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
-<BR><INPUT NAME="submit" TYPE="button" VALUE="<% 
-  $rate->ratenum ? "Apply changes" : "Add rate plan"
-%>" onClick="document.OneTrueForm.submit.disabled=true; process();">
+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>