new tax rate editor

3 files changed, 112 insertions, 88 deletions

diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index e550e8b4a..4e04f37fc 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,59 +1,55 @@
-%
-%
-%$cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
-%my $taxnum = $1;
-%my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
-%  or die ("Unknown taxnum!");
-%
-%my @expansion;
-%if ( $cgi->param('delim') eq 'n' ) {
-%  @expansion=split(/\n/,$cgi->param('expansion'));
-%} elsif ( $cgi->param('delim') eq 's' ) {
-%  @expansion=split(' ',$cgi->param('expansion'));
-%} else {
-%  die "Illegal delim!";
-%}
-%
-%@expansion=map {
-%  unless ( /^\s*([\w\- ]+)\s*$/ ) {
-%    $cgi->param('error', "Illegal item in expansion");
-%    print $cgi->redirect(popurl(2). "cust_main_county-expand.cgi?". $cgi->query_string );
-%    myexit();
-%  }
-%  $1;
-%} @expansion;
-%
-%foreach ( @expansion) {
-%  my(%hash)=$cust_main_county->hash;
-%  my($new)=new FS::cust_main_county \%hash;
-%  $new->setfield('taxnum','');
-%  if ( $cgi->param('taxclass') ) {
-%    $new->setfield('taxclass', $_);
-%  } elsif ( ! $cust_main_county->state ) {
-%    $new->setfield('state',$_);
-%  } else {
-%    $new->setfield('county',$_);
-%  }
-%  #if (datasrc =~ m/Pg/)
-%  #{
-%  #    $new->setfield('tax',0.0);
-%  #}
-%  my($error)=$new->insert;
-%  die $error if $error;
-%}
-%
-%unless ( qsearch( 'cust_main', {
-%                                 'state'  => $cust_main_county->state,
-%                                 'county' => $cust_main_county->county,
-%                                 'country' =>  $cust_main_county->country,
-%                               } )
-%         || ! @expansion
-%) {
-%  my($error)=($cust_main_county->delete);
-%  die $error if $error;
-%}
-%
-%print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
-%
-%
+<% include('/elements/header-popup.html', 'Addition successful' ) %>
 
+<SCRIPT TYPE="text/javascript">
+  window.top.location.reload();
+</SCRIPT>
+
+</BODY>
+</HTML>
+<%init>
+
+$cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
+my $taxnum = $1;
+my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+  or die ("Unknown taxnum!");
+
+my @expansion = split /[\n\r]{1,2}/, $cgi->param('expansion');
+#warn scalar(@expansion);
+#warn "$_: $expansion[$_]\n" foreach (0..$#expansion);
+
+@expansion=map {
+  unless ( /^\s*([\w\- ]+)\s*$/ ) {
+    $cgi->param('error', "Illegal item in expansion: $_");
+    print $cgi->redirect(popurl(2). "cust_main_county-expand.cgi?". $cgi->query_string );
+    myexit();
+  }
+  $1;
+} @expansion;
+
+foreach ( @expansion) {
+  my(%hash)=$cust_main_county->hash;
+  my($new)=new FS::cust_main_county \%hash;
+  $new->setfield('taxnum','');
+  if ( $cgi->param('taxclass') ) {
+    $new->setfield('taxclass', $_);
+  } elsif ( ! $cust_main_county->state ) {
+    $new->setfield('state',$_);
+  } else {
+    $new->setfield('county',$_);
+  }
+  my $error = $new->insert;
+  die $error if $error;
+}
+
+unless ( qsearch( 'cust_main', {
+                                 'state'  => $cust_main_county->state,
+                                 'county' => $cust_main_county->county,
+                                 'country' =>  $cust_main_county->country,
+                               } )
+         || ! @expansion
+) {
+  my $error = $cust_main_county->delete;
+  die $error if $error;
+}
+
+</%init>
diff --git a/httemplate/edit/process/cust_main_county.html b/httemplate/edit/process/cust_main_county.html
new file mode 100644
index 000000000..3d9d20b85
--- /dev/null
+++ b/httemplate/edit/process/cust_main_county.html
@@ -0,0 +1,6 @@
+<% include( 'elements/process.html',
+              'table' => 'cust_main_county',
+              'popup_reload' => 'Tax changed', #a popup "parent reload" for now
+              #someday change the individual element and go away instead
+          )
+%>
diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html
index 19d3fbef1..a671ca118 100644
--- a/httemplate/edit/process/elements/process.html
+++ b/httemplate/edit/process/elements/process.html
@@ -17,9 +17,11 @@ Example:
    # optional
    ###
 
-   'viewall_dir' => '', #'search' or 'browse', defaults to 'search'
+   'viewall_dir'  => '', #'search' or 'browse', defaults to 'search'
    OR
-   'redirect'    => 'view/table.cgi?', # value of primary key is appended
+   'redirect'     => 'view/table.cgi?', # value of primary key is appended
+   OR
+   'popup_reload' => 'Momentary success message', #will reload parent window
 
    'error_redirect' => popurl(2).'edit/table.cgi?', #query string appended
 
@@ -60,6 +62,54 @@ Example:
  )
 
 </%doc>
+%if ( $error ) {
+%
+%  my $edit_ext = $opt{'edit_ext'} || 'html';
+%  my $url = $opt{'error_redirect'} || popurl(2)."$table.$edit_ext";
+%  if ( length($cgi->query_string) > 1920 ) { #stupid IE 2083 URL limit
+% 
+%    my $session = int(rand(4294967296)); #XXX
+%    my $pref = new FS::access_user_pref({
+%      'usernum'    => $FS::CurrentUser::CurrentUser->usernum,
+%      'prefname'   => "redirect$session",
+%      'prefvalue'  => $cgi->query_string,
+%      'expiration' => time + 3600, #1h?  1m?
+%    });
+%    my $pref_error = $pref->insert;
+%    if ( $pref_error ) {
+%      die "FATAL: couldn't even set redirect cookie: $pref_error".
+%          " attempting to set redirect$session to ". $cgi->query_string."\n";
+%    }
+%
+<% $cgi->redirect("$url?redirect=$session") %>
+%
+%  } else {
+%
+<% $cgi->redirect("$url?". $cgi->query_string ) %>
+%
+%  } 
+%
+% #different ways of handling success
+%
+%} elsif ( $opt{'popup_reload'} ) {
+
+  <% include('/elements/header-popup.html', $opt{'popup_reload'} ) %>
+
+  <SCRIPT TYPE="text/javascript">
+    window.top.location.reload();
+  </SCRIPT>
+
+  </BODY>
+  </HTML>
+
+%} elsif ( $opt{'redirect'} ) {
+%
+<% $cgi->redirect( $opt{'redirect'}. $pkeyvalue ) %>
+%
+%} else { 
+%
+<% $cgi->redirect( popurl(3). ($opt{viewall_dir}||'search'). "/$table.html" ) %>
+%}
 <%once>
 
   my $me = 'process.html:';
@@ -162,7 +212,6 @@ if ( !$error && $opt{'process_m2name'} ) {
                                );
 }
 
-# XXX print?!?!
 
 if ( $error ) {
   $cgi->param('error', $error);
@@ -171,33 +220,6 @@ if ( $error ) {
       $cgi->param($field, '')
     }
   }
-  my $edit_ext = $opt{'edit_ext'} || 'html';
-  my $url = $opt{'error_redirect'} || popurl(2)."$table.$edit_ext";
-  if ( length($cgi->query_string) > 1920 ) { #stupid IE 2083 URL limit
-
-    my $session = int(rand(4294967296)); #XXX
-    my $pref = new FS::access_user_pref({
-      'usernum'    => $FS::CurrentUser::CurrentUser->usernum,
-      'prefname'   => "redirect$session",
-      'prefvalue'  => $cgi->query_string,
-      'expiration' => time + 3600, #1h?  1m?
-    });
-    my $pref_error = $pref->insert;
-    if ( $pref_error ) {
-      die "FATAL: couldn't even set redirect cookie: $pref_error".
-          " attempting to set redirect$session to ". $cgi->query_string."\n";
-    }
-    print $cgi->redirect("$url?redirect=$session");
-  } else {
-    print $cgi->redirect("$url?". $cgi->query_string );
-  } 
-} elsif ( $opt{'redirect'} ) {
-  print $cgi->redirect( $opt{'redirect'}. $pkeyvalue );
-} else { 
-  print $cgi->redirect( popurl(3).
-                        ( $opt{'viewall_dir'} || 'search' ).
-                        "/$table.html"
-                      );
 }
 
 </%init>