X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main.cgi;h=a8f202fbb937504b13b46b02daccd4d95f037442;hb=f1da1afefb2501e1514d267612fafa87f0ac8108;hp=f5826f31b660711d5612737b32f9e8d2c73538ad;hpb=f7fd2a3e34da751cbc02bbf215e99c6dc89adc15;p=freeside.git diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi index f5826f31b..a8f202fbb 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,7 @@ 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'); } elsif ( $cgi->keywords ) { #editing my( $query ) = $cgi->keywords; $query =~ /^(\d+)$/; @@ -64,20 +65,23 @@ if ( $cgi->param('error') ) { $cgi->delete_all(); my $action = $custnum ? 'Edit' : 'Add'; -# top +%> -my $p1 = popurl(1); -print header("Customer $action", '', ' onUnload="myclose()"'); -print qq!Error: !, $error, "" - if $error; + -print qq!
!, - qq!!, - qq!Customer # !, ( $custnum ? "$custnum" : " (NEW)" ), - -; +<%= header("Customer $action", '', ' onUnload="myclose()"') %> + +<% if ( $error ) { %> +Error: <%= $error %> +<% } %> -# agent + + +Customer # <%= $custnum ? "$custnum" : " (NEW)" %> + + + +<% my $r = qq!* !; @@ -87,21 +91,22 @@ 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 "; -} + +%> + +<% if ( scalar(@agents) == 1 ) { %> + +<% } else { %> +

<%=$r%>Agent +<% } %> + +<% + +# (referral and referring customer still need to be "template"ized) #referral @@ -150,110 +155,54 @@ if ( $cust_main->referral_custnum 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; - -my $statedefault = $conf->config('statedefault') - || ($countrydefault eq 'US' ? 'CA' : ''); -$cust_main->state( $statedefault ) - unless $cust_main->state || $cust_main->country ne $countrydefault; - -my($county_html, $state_html, $country_html) = - FS::cust_main_county::regionselector( $cust_main->county, - $cust_main->state, - $cust_main->country ); - -print "$county_html $state_html"; - -print qq!${r}Zip!; - -my($daytime,$night,$fax)=( - $cust_main->daytime, - $cust_main->night, - $cust_main->fax, - '', - 'changed(this)', -); +%> -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') ) { - - print "\n", < - function changed(what) { - what.form.same.checked = false; + -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 ) @@ -261,244 +210,142 @@ 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 ) %> - $cust_main->ship_state( $statedefault ) - unless $cust_main->ship_state - || $cust_main->ship_country ne $countrydefault; +', - &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 number (help)
${r}Bank name !, - 'DCHK' => qq!Electronic check (on-demand)
${r}Account number
${r}ABA/Routing number (help)
${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!; - } - } - - 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 number (help)
${r}Bank name !, - 'DCHK' => qq!Electronic check (on-demand)
${r}Account number
${r}ABA/Routing number (help)
${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 + ": " + 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', + + 'tax', + 'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX' + ) { +%> + +<% } %> + +
Comments +<%= &ntable("#cccccc") %> + + + + + + + +<% unless ( $custnum ) { # pry the wrong place for this logic. also pretty expensive @@ -528,7 +375,7 @@ unless ( $custnum ) { # print "

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

First package", &itable("#cccccc"), + print "
First package", &ntable("#cccccc"), qq!!, - qq!
!, - "", + qq!

!, + "", ; %>