fix disappearing email invoice on errors, finally (closes: Bug#35)

[freeside.git] / httemplate / edit / process / cust_main.cgi

diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index c8038ec..5e6000c 100755 (executable)
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -8,24 +8,16 @@ $cgi->param('tax','') unless defined $cgi->param('tax');
 
 $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
 
-$cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
-  or die "Oops, illegal \"state\" param: ". $cgi->param('state');
-$cgi->param('state', $1);
-$cgi->param('county', $3 || '');
-$cgi->param('country', $4);
-
-$cgi->param('ship_state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
-  or $cgi->param('ship_state') =~ /^(((())))$/
-  or die "Oops, illegal \"ship_state\" param: ". $cgi->param('ship_state');
-$cgi->param('ship_state', $1);
-$cgi->param('ship_county', $3 || '');
-$cgi->param('ship_country', $4);
-
 my $payby = $cgi->param('payby');
 if ( $payby ) {
-  $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
+  if ( $payby eq 'CHEK' ) {
+    $cgi->param('payinfo',
+      $cgi->param('CHEK_payinfo1'). '@'. $cgi->param('CHEK_payinfo2') );
+  } else {
+    $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
+  }
   $cgi->param('paydate',
-  $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
+    $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
   $cgi->param('payname', $cgi->param( $payby. '_payname' ) );
 }
 
@@ -33,6 +25,7 @@ $cgi->param('otaker', &getotaker );
 
 my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
 push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
+$cgi->param('invoicing_list', join(',', @invoicing_list) );
 
 #create new record object