X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Frate_region.cgi;h=f77c0dbe770b403d385627fa025f866657be140f;hb=7b125e587a4d1ee0aca692e23ea7897f671855ae;hp=bd3dcbd46695a7b0792d763bf40a725ffa792a44;hpb=718f65eee1c797ea90a315b5f03fae75c80a5112;p=freeside.git

diff --git a/httemplate/edit/rate_region.cgi b/httemplate/edit/rate_region.cgi
index bd3dcbd46..f77c0dbe7 100644
--- a/httemplate/edit/rate_region.cgi
+++ b/httemplate/edit/rate_region.cgi
@@ -1,84 +1,73 @@
-<!-- mason kludge -->
-%
-%
-%my $rate_region;
-%if ( $cgi->param('error') ) {
-%  $rate_region = new FS::rate_region ( {
-%    map { $_, scalar($cgi->param($_)) } fields('rate_region')
-%  } );
-%} elsif ( $cgi->keywords ) {
-%  my($query) = $cgi->keywords;
-%  $query =~ /^(\d+)$/;
-%  $rate_region = qsearchs( 'rate_region', { 'regionnum' => $1 } );
-%} else { #adding
-%  $rate_region = new FS::rate_region {};
-%}
-%my $action = $rate_region->regionnum ? 'Edit' : 'Add';
-%
-%my $p1 = popurl(1);
-%
-%my %granularity = (
-%  '6'  => '6 second',
-%  '60' => 'minute',
-%);
-%
-%my @rate_prefix = $rate_region->rate_prefix;
-%my $countrycode = '';
-%if ( @rate_prefix ) {
-%  $countrycode = $rate_prefix[0]->countrycode;
-%  foreach my $rate_prefix ( @rate_prefix ) {
-%    errorpage('multiple country codes per region not yet supported by web UI')
-%      unless $rate_prefix->countrycode eq $countrycode;
-%  }
-%}
-%
-%
-
-
 <% include("/elements/header.html","$action Region", menubar(
-      'Main Menu' => $p,
-      #'View all regions' => "${p}browse/rate_region.cgi",
+      'View all regions' => "${p}browse/rate_region.html",
     ))
 %>
-% if ( $cgi->param('error') ) { 
-
-<FONT SIZE="+1" COLOR="#ff0000">Error: <% $cgi->param('error') %></FONT><BR>
-% } 
 
+<% include('/elements/error.html') %>
 
 <FORM ACTION="<%$p1%>process/rate_region.cgi" METHOD=POST>
 
 <INPUT TYPE="hidden" NAME="regionnum" VALUE="<% $rate_region->regionnum %>">
 
+%# region info
+
 <% ntable('#cccccc') %>
-<TR>
-  <TH ALIGN="right">Region name</TH>
-  <TD><INPUT TYPE="text" NAME="regionname" SIZE=32 VALUE="<% $rate_region->regionname %>"></TR>
-</TR>
 
-<TR>
-  <TH ALIGN="right">Country code</TH>
-  <TD><INPUT TYPE="text" NAME="countrycode" SIZE=4 MAXLENGTH=3 VALUE="<% $countrycode %>"></TR>
-</TR>
+  <TR>
+    <TH ALIGN="right">Region name</TH>
+    <TD><INPUT TYPE="text" NAME="regionname" SIZE=32 VALUE="<% $rate_region->regionname %>"></TR>
+  </TR>
 
+  <TR>
+    <TH ALIGN="right">Country code</TH>
+    <TD><INPUT TYPE="text" NAME="countrycode" SIZE=4 MAXLENGTH=3 VALUE="<% $countrycode %>"></TR>
+  </TR>
 
-<TR>
-  <TH ALIGN="right">Prefixes</TH>
-  <TD>
-    <TEXTAREA NAME="npa" WRAP=SOFT><% join(', ', map $_->npa, @rate_prefix ) %></TEXTAREA>
-  </TD>
-</TR>
+  <TR>
+    <TD ALIGN="right">
+      <B>Prefixes</B>
+      <BR><FONT SIZE="-1">(comma-separated)</FONT>
+    </TD>
+    <TD>
+      <TEXTAREA NAME="npa" WRAP=SOFT><% join(', ', map { $_->npa. (length($_->nxx) ? '-'.$_->nxx : '') } @rate_prefix ) %></TEXTAREA>
+    </TD>
+  </TR>
 
 </TABLE>
 
+%# rate plan info
+
 <BR>
-<% table() %>
-<TR>
-  <TH>Rate plan</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>
+
+<% include('/elements/table-grid.html') %>
+%   my $bgcolor1 = '#eeeeee';
+%   my $bgcolor2 = '#ffffff';
+%   my $bgcolor = '';
+
+  <TR>
+    <TH CLASS="grid" BGCOLOR="#cccccc">
+      Rate plan
+    </TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">
+      <FONT SIZE=-1>Included<BR>minutes/calls</FONT>
+    </TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">
+      <FONT SIZE=-1>Connection<BR>charge</FONT>
+    </TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">
+      <FONT SIZE=-1>Connection<BR>charge for</FONT>
+    </TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">
+      <FONT SIZE=-1>Charge per<BR>minute/call</FONT>
+    </TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">
+      <FONT SIZE=-1>Granularity</FONT>
+    </TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">
+      <FONT SIZE=-1>Usage class</FONT>
+    </TH>
+  </TR>
+
 % foreach my $rate ( qsearch('rate', {}) ) {
 %
 %  my $n = $rate->ratenum;
@@ -88,32 +77,113 @@
 %                                             'sec_granularity' => '60'
 %                                           };
 %
-%
+% if ( $bgcolor eq $bgcolor1 ) {
+%   $bgcolor = $bgcolor2;
+% } else {
+%   $bgcolor = $bgcolor1;
+% }
 
   <TR>
-    <TD><A HREF="<%$p%>edit/rate.cgi?<% $rate->ratenum %>"><% $rate->ratename %></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}%>
-% } 
+    <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <A HREF="<%$p%>edit/rate.cgi?<% $rate->ratenum %>"><% $rate->ratename %></A>
+    </TD>
 
+    <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <INPUT TYPE="text" SIZE=9 NAME="min_included<%$n%>" VALUE="<% $cgi->param("min_included$n") || $rate_detail->min_included |h %>">
+    </TD>
+
+    <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <%$money_char%><INPUT TYPE="text" SIZE=9 NAME="conn_charge<%$n%>" VALUE="<% $cgi->param("conn_charge$n") || $rate_detail->conn_charge |h %>">
+    </TD>
+
+    <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <SELECT NAME="conn_sec<%$n%>">
+%       foreach my $conn_sec ( keys %conn_secs ) {
+%         my $curr_value = $cgi->param("conn_sec$n") || $rate_detail->conn_sec;
+%         my $selected = ($conn_sec==$curr_value) ? ' SELECTED' : '';
+          <OPTION VALUE="<% $conn_sec %>" <%$selected%>><% $conn_secs{$conn_sec} %></OPTION>
+%       }
+    </TD>
+
+    <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <%$money_char%><INPUT TYPE="text" SIZE=6 NAME="min_charge<%$n%>" VALUE="<% $cgi->param("min_charge$n") || $rate_detail->min_charge |h %>">
+    </TD>
+
+    <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <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>
+    </TD>
+
+    <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <% include( '/elements/select-table.html',
+                  'element_name' => "classnum$n",
+                  'table'        => 'usage_class',
+                  'name_col'     => 'classname',
+                  'empty_label'  => '(default)',
+                  'hashref'      => { disabled => '' },
+                  'curr_value'   => ( $cgi->param("classnum$n") ||
+                                      $rate_detail->classnum ),
+                )
+      %>
+    </TD>
+
   </TR>
-% } 
 
+% } 
 
 </TABLE>
 
-<BR><BR><INPUT TYPE="submit" VALUE="<% 
-  $rate_region->regionnum ? "Apply changes" : "Add region"
-%>">
 
-    </FORM>
-  </BODY>
-</HTML>
+<BR><BR>
+<INPUT TYPE="submit" VALUE="<% $rate_region->regionnum ? "Apply changes" : "Add region" %>">
+
+</FORM>
+
+<% include('/elements/footer.html') %>
+<%once>
+
+tie my %conn_secs,   'Tie::IxHash', FS::rate_detail::conn_secs();
+
+</%once>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
+
+my $rate_region;
+if ( $cgi->param('error') ) {
+  $rate_region = new FS::rate_region ( {
+    map { $_, scalar($cgi->param($_)) } fields('rate_region')
+  } );
+} elsif ( $cgi->keywords ) {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/ or die "unparsable regionnum";
+  $rate_region = qsearchs( 'rate_region', { 'regionnum' => $1 } )
+    or die "unknown regionnum $1\n";
+} else { #adding
+  $rate_region = new FS::rate_region {};
+}
+my $action = $rate_region->regionnum ? 'Edit' : 'Add';
+
+my $p1 = popurl(1);
+
+tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
 
+my @rate_prefix = $rate_region->rate_prefix;
+my $countrycode = '';
+if ( @rate_prefix ) {
+  $countrycode = $rate_prefix[0]->countrycode;
+  foreach my $rate_prefix ( @rate_prefix ) {
+    errorpage('multiple country codes per region not yet supported by web UI')
+      unless $rate_prefix->countrycode eq $countrycode;
+  }
+}
 
+</%init>