From 2b49cbe76b94c6c1561aa2bf37beba7d47591190 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 24 Aug 2005 13:22:27 +0000 Subject: customer edit: abstract out billing info to billing.html, re-do payment type selection with HTML::Widgets::SelectLayers, add Switch/Solo/Maestro support for start date & issue #. customer view: re-order fields for consistency. selfservice API: support paystart_month, paystart_year, payissue and payip in MyAccount::process_payment and ::edit_info and Signup::new_customer, FS::cust_main::realtime_bop: support paystart_month paystart_year payissue payip fields --- httemplate/edit/cust_main.cgi | 276 +++++++++++++++++------------------------- 1 file changed, 113 insertions(+), 163 deletions(-) (limited to 'httemplate/edit/cust_main.cgi') diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi index 61468f382..2911fc1e7 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+)$/; @@ -74,7 +75,7 @@ my $action = $custnum ? 'Edit' : 'Add'; Error: <%= $error %> <% } %> -
+ Customer # <%= $custnum ? "$custnum" : " (NEW)" %> @@ -199,7 +200,7 @@ function samechanged(what) { my $checked = ''; my $disabled = ''; my $disabledselect = ''; - unless ( $cust_main->ship_last && $cgi->param('same') ne 'Y' ) { + unless ( $cust_main->ship_last && $same ne 'Y' ) { $checked = 'CHECKED'; $disabled = 'DISABLED style="background-color: #dddddd"'; foreach ( @@ -218,184 +219,133 @@ Service address <% } %> -<% -# billing info - -sub expselect { - my $prefix = shift; - my( $m, $y ) = (0, 0); - if ( scalar(@_) ) { - my $date = shift || '01-2000'; - if ( $date =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format - ( $m, $y ) = ( $2, $1 ); - } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) { - ( $m, $y ) = ( $1, $3 ); - } else { - die "unrecognized expiration date format: $date"; - } - } - - my $return = qq!!; - my @t = localtime; - my $thisYear = $t[5] + 1900; - for ( ($thisYear > $y && $y > 0 ? $y : $thisYear) .. 2037 ) { - $return .= "config('payby-default'); + -if ( $payby_default eq 'HIDE' ) { +<%= include('cust_main/billing.html', $cust_main ) %> - $cust_main->payby('BILL') unless $cust_main->payby; +', - &table("#cccccc"), ""; - - my($payinfo, $payname)=( - $cust_main->payinfo, - $cust_main->payname, + var billing_bottomvars = new Array( + 'tax', + 'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX' ); - 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) !; - } + for ( f=0; f < topvars.length; f++ ) { + var field = topvars[f]; + copyelement( document.topform.elements[field], + document.bottomform.elements[field] + ); } - 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; + var layerform = document.topform.select.options[document.topform.select.selectedIndex].value; + for ( f=0; f < layervars.length; f++ ) { + var field = layervars[f]; + copyelement( document.forms[layerform].elements[field], + document.bottomform.elements[field] + ); + } - foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 bs - $paybychecked{$payby} .= qq!
CVV2 (help) !; - } + for ( f=0; f < billing_bottomvars.length; f++ ) { + var field = billing_bottomvars[f]; + copyelement( document.billing_bottomform.elements[field], + document.bottomform.elements[field] + ); } +} - $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{$_}!; +function copyelement(from, to) { + if ( from == undefined ) { + to.value = ''; + } else if ( from.type == 'select-one' ) { + to.value = from.options[from.selectedIndex].value; + //alert(from + " (" + from.type + "): " + to.name + " => (" + from.selectedIndex + ") " + to.value); + } else if ( from.type == 'checkbox' ) { + if ( from.checked ) { + to.value = from.value; } else { - print qq!> $payby{$_}!; + to.value = ''; + } + } else { + if ( from.value == undefined ) { + to.value = ''; + } else { + to.value = from.value; } } + //alert(from + ": " + to.name + " => " + to.value); +} - print "$r required fields for each billing type"; + -} + + +<% 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', + 'exp_month', 'exp_year', 'paycvv', + 'paystart_month', 'paystart_year', 'payissue', + 'payip', + + 'tax', + 'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX' + ) { +%> + +<% } %> -if ( defined $cust_main->dbdef_table->column('comments') ) { - print "

Comments", &itable("#cccccc"), - qq!", - ""; -} +
Comments +<%= &ntable("#cccccc") %> + + + + + + + +<% unless ( $custnum ) { # pry the wrong place for this logic. also pretty expensive @@ -425,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!

!, + "", ; %> -- cgit v1.2.1