X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fcust_main.cgi;h=44fbb4f10f562d827e60ebc183311d5d1ccf42ed;hb=9b4209f91ad9e3c4cef7deebfb0180f6faf1d0dc;hp=f72ca0a819471afc6fdebd353bb5087c39e014c1;hpb=40a7b3dc653e099f7bd0bd762b649b04c4432db2;p=freeside.git diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi index f72ca0a81..44fbb4f10 100755 --- a/httemplate/edit/process/cust_main.cgi +++ b/httemplate/edit/process/cust_main.cgi @@ -42,8 +42,11 @@ $cgi->param('payby', $payby); if ( $payby ) { if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) { - $cgi->param('payinfo', - $cgi->param('payinfo1'). '@'. $cgi->param('payinfo2') ); + my $payinfo = $cgi->param('payinfo1'). '@'; + $payinfo .= $cgi->param('payinfo3').'.' + if $conf->config('echeck-country') eq 'CA'; + $payinfo .= $cgi->param('payinfo2'); + $cgi->param('payinfo',$payinfo); } $cgi->param('paydate', $cgi->param( 'exp_month' ). '-'. $cgi->param( 'exp_year' ) ); @@ -60,12 +63,19 @@ $cgi->param('invoicing_list', join(',', @invoicing_list) ); my $new = new FS::cust_main ( { map { $_, scalar($cgi->param($_)) -# } qw(custnum agentnum last first ss company address1 address2 city county -# state zip daytime night fax payby payinfo paydate payname tax -# otaker refnum) } fields('cust_main') } ); +$cgi->param('duplicate_of_custnum') =~ /^(\d+)$/; +my $duplicate_of = $1; +if ( $duplicate_of ) { + # then negate all changes to the customer; the only change we should + # make is to order a package, if requested + $new = qsearchs('cust_main', { 'custnum' => $duplicate_of }) + # this should never happen + or die "nonexistent existing customer (custnum $duplicate_of)"; +} + if ( defined($cgi->param('same')) && $cgi->param('same') eq "Y" ) { $new->setfield("ship_$_", '') foreach qw( last first company address1 address2 city county state zip @@ -73,6 +83,12 @@ if ( defined($cgi->param('same')) && $cgi->param('same') eq "Y" ) { ); } +if ( $cgi->param('no_credit_limit') ) { + $new->setfield('credit_limit', ''); +} + +$new->tagnum( [ $cgi->param('tagnum') ] ); + my %usedatetime = ( 'birthdate' => 1 ); foreach my $dfield (qw( birthdate signupdate )) { @@ -92,13 +108,12 @@ foreach my $dfield (qw( birthdate signupdate )) { if ( $dt ) { $parsed = $dt->epoch; } else { - # $error ||= $cgi->param('birthdate') . " is an invalid birthdate:" . $parser->errmsg; $error ||= "Invalid $dfield: $value"; } } else { - $parsed = str2time($value) + $parsed = parse_datetime($value) or $error ||= "Invalid $dfield: $value"; } @@ -117,7 +132,7 @@ my @exempt_groups = grep /\S/, $conf->config('tax-cust_exempt-groups'); my @tax_exempt = grep { $cgi->param("tax_$_") eq 'Y' } @exempt_groups; #perhaps this stuff should go to cust_main.pm -if ( $new->custnum eq '' ) { +if ( $new->custnum eq '' or $duplicate_of ) { my $cust_pkg = ''; my $svc; @@ -153,13 +168,10 @@ if ( $new->custnum eq '' ) { $cust_pkg = new FS::cust_pkg ( { #later 'custnum' => $custnum, - 'pkgpart' => $pkgpart, + 'pkgpart' => $pkgpart, + 'locationnum' => scalar($cgi->param('locationnum')), } ); - #$error ||= $cust_pkg->check; - #$cust_svc = new FS::cust_svc ( { 'svcpart' => $svcpart } ); - - #$error ||= $cust_svc->check; my $part_svc = qsearchs('part_svc', { 'svcpart' => $svcpart } ); my $svcdb = $part_svc->svcdb; @@ -186,37 +198,59 @@ if ( $new->custnum eq '' ) { } elsif ( $svcdb eq 'svc_phone' ) { my %svc_phone = ( - 'svcpart' => $svcpart, - map { $_ => scalar($cgi->param($_)) } - qw( countrycode phonenum sip_password pin phone_name ) - ); + 'svcpart' => $svcpart, + map { $_ => scalar($cgi->param($_)) } + qw( countrycode phonenum sip_password pin phone_name ) + ); $svc = new FS::svc_phone \%svc_phone; + } elsif ( $svcdb eq 'svc_dsl' ) { + + my %svc_dsl = ( + 'svcpart' => $svcpart, + ( map { $_ => scalar($cgi->param("ship_$_")) || scalar($cgi->param($_))} + qw( first last company ) + ), + ( map { $_ => scalar($cgi->param($_)) } + qw( loop_type phonenum password isp_chg isp_prev vendor_qual_id ) + ), + 'desired_due_date' => time, #XXX enter? + 'vendor_order_type' => 'NEW', + ); + $svc = new FS::svc_dsl \%svc_dsl; + } else { die "$svcdb not handled on new customer yet"; } - #$error ||= $svc_acct->check; - } + use Tie::RefHash; tie my %hash, 'Tie::RefHash'; %hash = ( $cust_pkg => [ $svc ] ) if $cust_pkg; - $error ||= $new->insert( \%hash, \@invoicing_list, - 'tax_exemption' => \@tax_exempt, - ); + if ( $duplicate_of ) { + # order the package and service normally + $error ||= $new->order_pkgs( \%hash ) if $cust_pkg; + } + else { + # create the customer + $error ||= $new->insert( \%hash, \@invoicing_list, + 'tax_exemption'=> \@tax_exempt, + 'prospectnum' => scalar($cgi->param('prospectnum')), + ); - my $conf = new FS::Conf; - if ( $conf->exists('backend-realtime') && ! $error ) { + my $conf = new FS::Conf; + if ( $conf->exists('backend-realtime') && ! $error ) { - my $berror = $new->bill - || $new->apply_payments_and_credits - || $new->collect( 'realtime' => 1 ); - warn "Warning, error billing during backend-realtime: $berror" if $berror; + my $berror = $new->bill + || $new->apply_payments_and_credits + || $new->collect( 'realtime' => 1 ); + warn "Warning, error billing during backend-realtime: $berror" if $berror; - } + } + } #if $duplicate_of } else { #create old record object @@ -231,9 +265,15 @@ if ( $new->custnum eq '' ) { if ($new->stateid =~ /^xxx/) { $new->stateid($old->stateid); } - if ($new->payby =~ /^(CARD|DCRD)$/ && $new->payinfo =~ /xx/) { + if ( $new->payby =~ /^(CARD|DCRD)$/ + && ( $new->payinfo =~ /xx/ + || $new->payinfo =~ /^\s*N\/A\s+\(tokenized\)\s*$/ + ) + ) + { $new->payinfo($old->payinfo); - } elsif ($new->payby =~ /^(CHEK|DCHK)$/ && $new->payinfo =~ /xx/) { + + } elsif ( $new->payby =~ /^(CHEK|DCHK)$/ && $new->payinfo =~ /xx/ ) { #fix for #3085 "edit of customer's routing code only surprisingly causes #nothing to happen... # this probably won't do the right thing when we don't have the @@ -245,6 +285,11 @@ if ( $new->custnum eq '' ) { $new->payinfo($new_account.'@'.$new_aba); } + if ( ! $conf->exists('cust_main-edit_signupdate') or + ! $new->signupdate ) { + $new->signupdate($old->signupdate); + } + warn "$me calling $new -> replace( $old, \ @invoicing_list )" if $DEBUG; local($FS::cust_main::DEBUG) = $DEBUG if $DEBUG; local($FS::Record::DEBUG) = $DEBUG if $DEBUG; @@ -257,4 +302,17 @@ if ( $new->custnum eq '' ) { } +unless ( $error ) { #XXX i guess i should be transactional... all in the insert + # or replace call + my @contact_fields = qw( classnum first last title comment emailaddress ); + foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) { + push @contact_fields, 'phonetypenum'.$phone_type->phonetypenum; + } + + $error = $new->process_o2m( 'table' => 'contact', + 'fields' => \@contact_fields, + 'params' => scalar($cgi->Vars), + ); +} +