X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Frate_region.cgi;h=b50d2daba8e60b362512f5ed1ba1518e350f8fae;hp=9dfcb3740c640fe50e034cd4707c11154f586e22;hb=c49cfd25a8f92c7a2f44b51d72506a21f6b8d09f;hpb=0930d22ffc440f80c1b222b2e750cadbabd9e8f6

diff --git a/httemplate/edit/rate_region.cgi b/httemplate/edit/rate_region.cgi
index 9dfcb3740..b50d2daba 100644
--- a/httemplate/edit/rate_region.cgi
+++ b/httemplate/edit/rate_region.cgi
@@ -11,7 +11,14 @@
 
 %# region info
 
-<% ntable('#cccccc') %>
+<TABLE CLASS="fsinnerbox">
+
+% if ( $rate_region->agent_regionid ) {
+    <TR>
+      <TH ALIGN="right">Legacy #</TH>
+      <TD><% $rate_region->agent_regionid |h %></TD>
+    </TR>
+% }
 
   <TR>
     <TH ALIGN="right">Region name</TH>
@@ -24,105 +31,71 @@
   </TR>
 
   <TR>
-    <TD ALIGN="right">
+    <TH 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>
-
-<% 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;
-%  my $rate_detail = $rate->dest_detail($rate_region)
-%                    || new FS::rate_region { 'min_included'    => 0,
-%                                             'min_charge'      => 0,
-%                                             'sec_granularity' => '60'
-%                                           };
-%
-% if ( $bgcolor eq $bgcolor1 ) {
-%   $bgcolor = $bgcolor2;
-% } else {
-%   $bgcolor = $bgcolor1;
-% }
-
-  <TR>
-
-    <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 |h %>">
-    </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>
+      <TEXTAREA NAME="npa" WRAP=SOFT><% join(', ', map { $_->npa. (length($_->nxx) ? '-'.$_->nxx : '') } @rate_prefix ) %></TEXTAREA>
     </TD>
-
   </TR>
 
-% } 
+  <& /elements/tr-checkbox.html,
+    label       => 'Exact match',
+    field       => 'exact_match',
+    cell_style  => 'font-weight: bold',
+    value       => 'Y',
+    curr_value  => $rate_region->exact_match
+  &>
 
 </TABLE>
 
-
-<BR><BR>
+<BR>
 <INPUT TYPE="submit" VALUE="<% $rate_region->regionnum ? "Apply changes" : "Add region" %>">
-
 </FORM>
+%# rate plan info, if the region has been created yet
+
+% if($rate_region->regionnum) {
+<BR><BR><FONT SIZE="+2">Rates in this region</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="regionnum"   VALUE="<% $rate_region->regionnum %>">
+<FONT SIZE="+1">Usage type: <% $select_cdr_type %></FONT>
+</FORM>
+% }
+<% include('/edit/elements/rate_detail.html',
+            'regionnum'   => $rate_region->regionnum,
+            'cdrtypenum'  => $cdrtypenum,
+) %>
+% }
 
 <% 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";
+} elsif ( $cgi->param('regionnum') ) {
+  $cgi->param('regionnum') =~ /^(\d+)$/ or die "unparseable regionnum";
   $rate_region = qsearchs( 'rate_region', { 'regionnum' => $1 } )
     or die "unknown regionnum $1\n";
 } else { #adding
@@ -132,12 +105,7 @@ 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',
-;
+tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
 
 my @rate_prefix = $rate_region->rate_prefix;
 my $countrycode = '';
@@ -148,5 +116,8 @@ if ( @rate_prefix ) {
       unless $rate_prefix->countrycode eq $countrycode;
   }
 }
-
+my $cdrtypenum = '';
+if ( $cgi->param('cdrtypenum') =~ /^(\d+)$/ ) {
+  $cdrtypenum = $1;
+}
 </%init>