X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Frate_region.cgi;h=1b271028dd60eb33223978e3295f42db713bb93e;hb=1fc8addc56f8daf12397da568eb1ac1b27fd3984;hp=09d3d2c420ea4037d380db671927a3722daaa6a3;hpb=f7fd2a3e34da751cbc02bbf215e99c6dc89adc15;p=freeside.git

diff --git a/httemplate/edit/process/rate_region.cgi b/httemplate/edit/process/rate_region.cgi
index 09d3d2c42..1b271028d 100755
--- a/httemplate/edit/process/rate_region.cgi
+++ b/httemplate/edit/process/rate_region.cgi
@@ -1,6 +1,19 @@
-<%
+%if ( $error ) {
+%  $cgi->param('error', $error);
+<% $cgi->redirect(popurl(2). "rate_region.cgi?". $cgi->query_string ) %>
+%} elsif ( $action eq 'Add' ) {
+<% $cgi->redirect(popurl(2). "rate_region.cgi?regionnum=$regionnum") %>
+%} else { 
+<% $cgi->redirect(popurl(3). "browse/rate_region.html") %>
+%}
+<%init>
+
+my $conf = new FS::Conf;
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
 my $regionnum = $cgi->param('regionnum');
+my $action = $regionnum ? 'Edit' : 'Add';
 
 my $old = qsearchs('rate_region', { 'regionnum' => $regionnum } ) if $regionnum;
 
@@ -12,40 +25,26 @@ my $new = new FS::rate_region ( {
 
 my $countrycode = $cgi->param('countrycode');
 my @npa = split(/\s*,\s*/, $cgi->param('npa'));
+my %npa = map { $_, 1 } @npa; #removing duplicates
+@npa = sort keys %npa;
 $npa[0] = '' unless @npa;
 my @rate_prefix = map {
+                        #my($npa,$nxx) = split('-', $_);
+                        s/\D//g;
                         new FS::rate_prefix {
                           'countrycode' => $countrycode,
+                          #'npa'         => $npa,
+                          #'nxx'         => $nxx,
                           'npa'         => $_,
                         }
                       } @npa;
-
-my @dest_detail = map {
-  my $ratenum = $_->ratenum;
-  new FS::rate_detail {
-    'ratenum'  => $ratenum,
-    map { $_ => $cgi->param("$_$ratenum") }
-        qw( min_included min_charge sec_granularity )
-  };
-} qsearch('rate', {} );
-
-
+# we no longer process dest_detail records here
 my $error;
 if ( $regionnum ) {
-  $error = $new->replace($old, 'rate_prefix' => \@rate_prefix,
-                               'dest_detail' => \@dest_detail, );
+  $error = $new->replace($old, 'rate_prefix' => \@rate_prefix );
 } else {
-  $error = $new->insert( 'rate_prefix' => \@rate_prefix,
-                         'dest_detail' => \@dest_detail, );
+  $error = $new->insert( 'rate_prefix' => \@rate_prefix );
   $regionnum = $new->getfield('regionnum');
 }
 
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "rate_region.cgi?". $cgi->query_string );
-} else { 
-  #print $cgi->redirect(popurl(3). "browse/rate_region.cgi");
-  print $cgi->redirect(popurl(3). "browse/rate.cgi");
-}
-
-%>
+</%init>