X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fcust_main.cgi;h=e1a5bc6e24255497c3fbd7a3b42322746bafe805;hb=b71b1576c68bc40ad26592b354feace37a029f0e;hp=04516e9848f314a8f05f05eeb1e5970b06c3de21;hpb=cd254e04ba204b5d0b4a69b65c392fb175dd1e97;p=freeside.git diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi index 04516e984..e1a5bc6e2 100755 --- a/httemplate/edit/process/cust_main.cgi +++ b/httemplate/edit/process/cust_main.cgi @@ -1,11 +1,28 @@ % if ( $error ) { % $cgi->param('error', $error); +% # workaround for create_uri_query's mangling of unicode characters, +% # false laziness with FS::Record::ut_coord +% use charnames ':full'; +% for my $pre (qw(bill ship)) { +% foreach (qw( latitude longitude)) { +% my $coord = $cgi->param($pre.'_'.$_); +% $coord =~ s/\N{DEGREE SIGN}\s*$//; +% $cgi->param($pre.'_'.$_, $coord); +% } +% } % my $query = $m->scomp('/elements/create_uri_query', 'secure'=>1); <% $cgi->redirect(popurl(2). "cust_main.cgi?$query" ) %> % % } else { % -<% $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new->custnum) %> +<% $cgi->redirect( -uri => popurl(3). "view/cust_main.cgi?". $new->custnum, + -cookie => CGI::Cookie->new( + -name => 'freeside_status', + -value => mt($freeside_status), + -expires => '+5m', + ), + ) +%> % % } <%once> @@ -99,7 +116,12 @@ if ( $cgi->param('no_credit_limit') ) { $new->setfield('credit_limit', ''); } -$new->tagnum( [ $cgi->param('tagnum') ] ); +#$new->tagnum( [ $cgi->param('tagnum') ] ); +my $params = $cgi->Vars; +$new->tagnum( [ + map { /^tagnum(\d+)/ && $1 } + grep { /^tagnum(\d+)/ && $cgi->param($_) } keys %$params +] ); $error ||= $new->set_national_id_from_cgi( $cgi ); @@ -165,7 +187,7 @@ if ( $cgi->param('residential_commercial') eq 'Residential' ) { $error = 'Email address required'; } - $options{'invoicing_list'} = [ split(/\s*,\s*/, $email) ]; + $options{'invoicing_list'} = [ split(/[,\s]+/, $email) ]; # XXX really should include the phone numbers in here also } else { @@ -198,8 +220,11 @@ if ( $vendor eq 'avalara' or $vendor eq 'suretax' ) { } #perhaps this stuff should go to cust_main.pm +my $freeside_status = ''; if ( $new->custnum eq '' or $duplicate_of ) { + $freeside_status = 'Customer added'; + my $cust_pkg = ''; my $svc; @@ -321,6 +346,8 @@ if ( $new->custnum eq '' or $duplicate_of ) { } else { #create old record object + $freeside_status = 'Customer edited'; + my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); $error ||= "Old record not found!" unless $old;