[freeside-commits] freeside/httemplate/edit rate.cgi, 1.13, 1.14 rate_region.cgi, 1.5, 1.6

Ivan,,, ivan at wavetail.420.am
Thu Jan 10 13:53:51 PST 2008


Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail:/tmp/cvs-serv4007/httemplate/edit

Modified Files:
	rate.cgi rate_region.cgi 
Log Message:
new rate editor

Index: rate_region.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/rate_region.cgi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rate_region.cgi	4 Jan 2008 02:27:28 -0000	1.5
+++ rate_region.cgi	10 Jan 2008 21:53:49 -0000	1.6
@@ -1,43 +1,5 @@
-<!-- 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",
     ))
 %>
 
@@ -47,35 +9,56 @@
 
 <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, @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</FONT>
+    </TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">
+      <FONT SIZE=-1>Charge per<BR>minute</FONT>
+    </TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">
+      <FONT SIZE=-1>Granularity</FONT>
+    </TH>
+  </TR>
+
 % foreach my $rate ( qsearch('rate', {}) ) {
 %
 %  my $n = $rate->ratenum;
@@ -85,32 +68,85 @@
 %                                             '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=5 NAME="min_included<%$n%>" VALUE="<% $cgi->param("min_included$n") || $rate_detail->min_included %>">
+    </TD>
 
+    <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      $<INPUT TYPE="text" SIZE=4 NAME="min_charge<%$n%>" VALUE="<% sprintf('%.2f', $cgi->param("min_charge$n") || $rate_detail->min_charge ) %>">
+    </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>
+
   </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') %>
+
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
+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',
+  '1', => '1 second',
+  '6'  => '6 second',
+  '30' => '30 second', # '1/2 minute',
+  '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;
+  }
+}
+
+</%init>

Index: rate.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/rate.cgi,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- rate.cgi	29 Oct 2007 11:34:20 -0000	1.13
+++ rate.cgi	10 Jan 2008 21:53:49 -0000	1.14
@@ -1,34 +1,3 @@
-%
-%
-%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",
@@ -49,72 +18,27 @@
 <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'
-%                              };
-%
-
-
-  <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>
+<% include('/elements/footer.html') %>
 
-</TABLE>
+<%init>
 
-<BR><INPUT NAME="submit" TYPE="button" VALUE="<% 
-  $rate->ratenum ? "Apply changes" : "Add rate plan"
-%>" onClick="document.OneTrueForm.submit.disabled=true; process();">
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
-    </FORM>
-  </BODY>
-</HTML>
+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';
 
+</%init>



More information about the freeside-commits mailing list