X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main.cgi;h=bb2a8618eb2b0861f44b938ed231f772299efac2;hp=bfe4a2d4f50bc04a1081b5dc7ee8053041cf33a9;hb=2c757d7db4cb6a7b9655de13206fcc84fb7ce61f;hpb=85be0d954dbe4a2c86841a37dc6a4df690dd5142 diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi index bfe4a2d4f..bb2a8618e 100755 --- a/httemplate/edit/cust_main.cgi +++ b/httemplate/edit/cust_main.cgi @@ -1,4 +1,3 @@ - <% #for misplaced logic below @@ -18,6 +17,7 @@ my $conf = new FS::Conf; my $error = ''; my($custnum, $username, $password, $popnum, $cust_main, $saved_pkgpart); my(@invoicing_list); +my $same = ''; if ( $cgi->param('error') ) { $error = $cgi->param('error'); $cust_main = new FS::cust_main ( { @@ -34,6 +34,8 @@ if ( $cgi->param('error') ) { $password = $cgi->param('_password'); $popnum = $cgi->param('popnum'); @invoicing_list = split( /\s*,\s*/, $cgi->param('invoicing_list') ); + $same = $cgi->param('same'); + $cust_main->setfield('paid' => $cgi->param('paid')) if $cgi->param('paid'); } elsif ( $cgi->keywords ) { #editing my( $query ) = $cgi->keywords; $query =~ /^(\d+)$/; @@ -64,20 +66,27 @@ if ( $cgi->param('error') ) { $cgi->delete_all(); my $action = $custnum ? 'Edit' : 'Add'; -# top +%> + + + +<%= include('/elements/header.html', + "Customer $action", + '', + ' onUnload="myclose()"' +) %> -my $p1 = popurl(1); -print header("Customer $action", '', ' onUnload="myclose()"'); -print qq!Error: !, $error, "" - if $error; +<% if ( $error ) { %> +Error: <%= $error %> +<% } %> -print qq!
!, - qq!!, - qq!Customer # !, ( $custnum ? "$custnum" : " (NEW)" ), - -; + + +Customer # <%= $custnum ? "$custnum" : " (NEW)" %> -# agent + + +<% my $r = qq!* !; @@ -87,171 +96,130 @@ my @agents = qsearch( 'agent', \%agent_search ); #die "No agents created!" unless @agents; eidiot "You have not created any agents (or all agents are disabled). You must create at least one agent before adding a customer. Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents; my $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first -if ( scalar(@agents) == 1 ) { - print qq!!; -} else { - print qq!

${r}Agent "; -} -#referral +%> + +<% if ( scalar(@agents) == 1 ) { %> + +<% } else { %> +

<%=$r%>Agent +<% } %> + + +<% my $refnum = $cust_main->refnum || $conf->config('referraldefault') || 0; if ( $custnum && ! $conf->exists('editreferrals') ) { - print qq!!; -} else { - my(@referrals) = qsearch('part_referral',{}); - if ( scalar(@referrals) == 0 ) { - eidiot "You have not created any advertising sources. You must create at least one advertising source before adding a customer. Go to ". popurl(2). "browse/part_referral.cgi and create one or more advertising sources."; - } elsif ( scalar(@referrals) == 1 ) { - $refnum ||= $referrals[0]->refnum; - print qq!!; - } else { - print qq!

${r}Advertising source "; - } -} +%> + + + +<% + } else { + + my(@referrals) = qsearch('part_referral',{}); + if ( scalar(@referrals) == 0 ) { + eidiot "You have not created any advertising sources. You must create at least one advertising source before adding a customer. Go to ". popurl(2). "browse/part_referral.cgi and create one or more advertising sources."; + } elsif ( scalar(@referrals) == 1 ) { + $refnum ||= $referrals[0]->refnum; +%> + + -#referring customer +<% } else { %> -#print qq!

Referring Customer: !; +

<%=$r%>Advertising source + +<% } %> + +<% } %> + + + +<% my $referring_cust_main = ''; if ( $cust_main->referral_custnum and $referring_cust_main = qsearchs('cust_main', { custnum => $cust_main->referral_custnum } ) ) { - print '

Referring Customer: '. - $cust_main->referral_custnum. ': '. - ( $referring_cust_main->company - || $referring_cust_main->last. ', '. $referring_cust_main->first ). - ''; -} elsif ( ! $conf->exists('disable_customer_referrals') ) { - print '

Referring customer number: '; -} else { - print ''; -} - -# contact info - -my($last,$first,$ss,$company,$address1,$address2,$city,$zip)=( - $cust_main->last, - $cust_main->first, - $cust_main->ss, - $cust_main->company, - $cust_main->address1, - $cust_main->address2, - $cust_main->city, - $cust_main->zip, -); - -print "

Billing address", &itable("#cccccc"), <${r}Contact name
(last, first) -END - -print < , - - -END - -if ( $conf->exists('show_ss') ) { - print qq!SS#!; -} else { - print qq!!; -} - -print < -Company -${r}Address -${r}City${r}State -END +%> -#false laziness with ship state -my $countrydefault = $conf->config('countrydefault') || 'US'; -$cust_main->country( $countrydefault ) unless $cust_main->country; +

Referring Customer: + <%= $cust_main->referral_custnum %>: <%= $referring_cust_main->name %> + -my $statedefault = $conf->config('statedefault') - || ($countrydefault eq 'US' ? 'CA' : ''); -$cust_main->state( $statedefault ) - unless $cust_main->state || $cust_main->country ne $countrydefault; +<% } elsif ( ! $conf->exists('disable_customer_referrals') ) { %> -my($county_html, $state_html, $country_html) = - FS::cust_main_county::regionselector( $cust_main->county, - $cust_main->state, - $cust_main->country ); +

Referring customer number: + -print "$county_html $state_html"; +<% } else { %> -print qq!${r}Zip!; + -my($daytime,$night,$fax)=( - $cust_main->daytime, - $cust_main->night, - $cust_main->fax, -); +<% } %> -my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone'; -my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone'; + -print <${r}Country$country_html -$daytime_label -$night_label -Fax -END +

+Billing address +<%= include('cust_main/contact.html', $cust_main, '', 'bill_changed(this)', '' ) %> -print "${r}required fields
"; + -# service address +<% if ( defined $cust_main->dbdef_table->column('ship_last') ) { %> -if ( defined $cust_main->dbdef_table->column('ship_last') ) { + -END +} + - print '
Service address ', - '(ship_last && $cgi->param('same') ne 'Y' ) { - print ' CHECKED'; +<% + my $checked = ''; + my $disabled = ''; + my $disabledselect = ''; + unless ( $cust_main->ship_last && $same ne 'Y' ) { + $checked = 'CHECKED'; + $disabled = 'DISABLED style="background-color: #dddddd"'; foreach ( qw( last first company address1 address2 city county state zip country daytime night fax ) @@ -259,234 +227,149 @@ END $cust_main->set("ship_$_", $cust_main->get($_) ); } } - print '>same as billing address)
'; - - my($ship_last,$ship_first,$ship_company,$ship_address1,$ship_address2,$ship_city,$ship_zip)=( - $cust_main->ship_last, - $cust_main->ship_first, - $cust_main->ship_company, - $cust_main->ship_address1, - $cust_main->ship_address2, - $cust_main->ship_city, - $cust_main->ship_zip, - ); +%> - print &itable("#cccccc"), <${r}Contact name
(last, first) -END +
+Service address +(>same as billing address) +<%= include('cust_main/contact.html', $cust_main, 'ship_', '', $disabled ) %> - print < , - -END +<% } %> - print < - Company - ${r}Address -   - ${r}City${r}State -END + - #false laziness with regular state - $cust_main->ship_country( $countrydefault ) unless $cust_main->ship_country; +<%= include( 'cust_main/billing.html', $cust_main, + 'invoicing_list' => \@invoicing_list, + ) +%> - $cust_main->ship_state( $conf->config('statedefault') || 'CA' ) - unless $cust_main->ship_state || $cust_main->ship_country ne 'US'; +', - &table("#cccccc"), ""; - - my($payinfo, $payname)=( - $cust_main->payinfo, - $cust_main->payname, - ); - - my %payby = ( - 'CARD' => qq!Credit card (automatic)
${r}
${r}Exp !. expselect("CARD"). qq!
${r}Name on card
!, - 'DCRD' => qq!Credit card (on-demand)
${r}
${r}Exp !. expselect("DCRD"). qq!
${r}Name on card
!, - 'CHEK' => qq!Electronic check (automatic)
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'DCHK' => qq!Electronic check (on-demand)
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'LECB' => qq!Phone bill billing
${r}Phone number !, - 'BILL' => qq!Billing
P.O.
Attention
!, - 'COMP' => qq!Complimentary
${r}Approved by
${r}Exp !. expselect("COMP"), -); - - if ( $cust_main->dbdef_table->column('paycvv') ) { - foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 bs - $payby{$payby} .= qq!
CVV2 (help!; + to.value = ''; } - } - - my( $account, $aba ) = split('@', $payinfo); - - my %paybychecked = ( - 'CARD' => qq!Credit card (automatic)
${r}
${r}Exp !. expselect("CARD", $cust_main->paydate). qq!
${r}Name on card
!, - 'DCRD' => qq!Credit card (on-demand)
${r}
${r}Exp !. expselect("DCRD", $cust_main->paydate). qq!
${r}Name on card
!, - 'CHEK' => qq!Electronic check (automatic)
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'DCHK' => qq!Electronic check (on-demand)
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'LECB' => qq!Phone bill billing
${r}Phone number !, - 'BILL' => qq!Billing
P.O.
Attention
!, - 'COMP' => qq!Complimentary
${r}Approved by
${r}Exp !. expselect("COMP", $cust_main->paydate), -); - - if ( $cust_main->dbdef_table->column('paycvv') ) { - my $paycvv = $cust_main->paycvv; - - foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 bs - $paybychecked{$payby} .= qq!
CVV2 (help!; - } - } - - - $cust_main->payby($payby_default) unless $cust_main->payby; - for (qw(CARD DCRD CHEK DCHK LECB BILL COMP)) { - print qq!payby eq "$_") { - print qq! CHECKED> $paybychecked{$_}!; + } else { + if ( from.value == undefined ) { + to.value = ''; } else { - print qq!> $payby{$_}!; + to.value = from.value; } } - - print "$r required fields for each billing type"; - + //alert(from + " (" + from.type + "): " + to.name + " => " + to.value); } -if ( defined $cust_main->dbdef_table->column('comments') ) { - print "

Comments", &itable("#cccccc"), - qq!", - ""; -} + + + + +<% foreach my $hidden ( + 'custnum', 'agentnum', 'refnum', 'referral_custnum', + 'last', 'first', 'ss', 'company', + 'address1', 'address2', 'city', + 'county', 'state', 'zip', 'country', + 'daytime', 'night', 'fax', + + 'same', + + 'ship_last', 'ship_first', 'ship_company', + 'ship_address1', 'ship_address2', 'ship_city', + 'ship_county', 'ship_state', 'ship_zip', 'ship_country', + 'ship_daytime','ship_night', 'ship_fax', + + 'select', #XXX key + + 'payauto', + 'payinfo', 'payinfo1', 'payinfo2', + 'payname', 'exp_month', 'exp_year', 'paycvv', + 'paystart_month', 'paystart_year', 'payissue', + 'payip', + 'paid', + + 'tax', + 'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX', + 'spool_cdr' + ) { +%> + +<% } %> + +
Comments +<%= &ntable("#cccccc") %> + + + + + + + +<% unless ( $custnum ) { # pry the wrong place for this logic. also pretty expensive @@ -514,49 +397,66 @@ unless ( $custnum ) { if ( @part_pkg ) { -# print "

First package", &itable("#cccccc", "0 ALIGN=LEFT"), -#apiabuse & undesirable wrapping - print "

First package", &itable("#cccccc"), - qq! + + +<%= include('/elements/footer.html') %> - foreach my $part_pkg ( @part_pkg ) { - print qq!