improve tax edit UI: add more counties & remove individual counties, RT#11144

1 files changed, 11 insertions, 4 deletions

diff --git a/httemplate/edit/process/cust_main_county-collapse.cgi b/httemplate/edit/process/cust_main_county-collapse.cgi
index 9608fc919..710e692fe 100755
--- a/httemplate/edit/process/cust_main_county-collapse.cgi
+++ b/httemplate/edit/process/cust_main_county-collapse.cgi
@@ -1,11 +1,15 @@
-<% $cgi->redirect(popurl(3). "browse/cust_main_county.cgi") %>
+<% $cgi->redirect(popurl(3). "browse/cust_main_county.cgi?".
+                             "country=". uri_escape($cgi->param('country')).";".
+                             'state='.   uri_escape($cgi->param('state')).  ';'.
+                             'county='.  uri_escape($cgi->param('county'))
+                 )
+%>
 <%init>
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/ or die "Illegal taxnum!";
+$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 $taxnum";
@@ -37,9 +41,12 @@ foreach my $delete ( qsearch('cust_main_county', \%search) ) {
 $cust_main_county->taxnum('');
 if ( $cust_main_county->city ) {
   $cust_main_county->city('');
-} else {
+} elsif ( $cust_main_county->county ) {
   $cust_main_county->county('');
+} else {
+  die "can't collapse that";
 }
+
 my $error = $cust_main_county->insert;
 die $error if $error;