diff options
author | ivan <ivan> | 2006-12-24 01:28:38 +0000 |
---|---|---|
committer | ivan <ivan> | 2006-12-24 01:28:38 +0000 |
commit | da757c2af713bedd8706e30ac002658b0c97ce28 (patch) | |
tree | 62ceb1d87b107d7fdd7b9b140ed29646258a6958 /httemplate/edit/cust_main | |
parent | 4a54e68baa0fe7c4171d57c3eb0e1579aa21ae77 (diff) |
fix more paymask regressions: allow editing records with existing expired cards, fix masking just-entered values when erroring out, fix echeck entry inserting as empty routing code and "xxEK" account number, remove old/deprecated/unused payinfo_maksed subs and calls
Diffstat (limited to 'httemplate/edit/cust_main')
-rw-r--r-- | httemplate/edit/cust_main/billing.html | 62 |
1 files changed, 25 insertions, 37 deletions
diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html index d3cd77dbb..b38d284c4 100644 --- a/httemplate/edit/cust_main/billing.html +++ b/httemplate/edit/cust_main/billing.html @@ -1,37 +1,21 @@ -% -% -%my( $cust_main, %options ) = @_; -%my @invoicing_list = @{ $options{'invoicing_list'} }; -%my $conf = new FS::Conf; -%my $payby_default = $conf->config('payby-default'); -% -%my @payby = grep /\w/, $conf->config('payby'); -%#@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP )) -%@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP )) -% unless @payby; -% %if ( $payby_default eq 'HIDE' ) { % % $cust_main->payby('BILL') unless $cust_main->payby; -% -% - <INPUT TYPE="hidden" NAME="select" VALUE="<% $cust_main->payby %>"> </FORM> <FORM NAME="<% $cust_main->payby %>" STYLE="margin-top: 0; margin-bottom: 0"> -% # XXX key - <INPUT TYPE="hidden" NAME="payinfo" VALUE="<% $cust_main->paymask %>"> -% foreach my $field (qw( payname paycvv paystart_month paystart_year payissue payip )) { +% foreach my $field (qw( payname paycvv paystart_month paystart_year payissue payip )) { <INPUT TYPE="hidden" NAME="<% $field %>" VALUE="<% $cust_main->getfield($field) %>"> + % } -% + % #false laziness w/elements/select-month_year.html & view/cust_main/billing.html % my( $mon, $year ); % my $date = $cust_main->paydate || '12-2037'; @@ -42,8 +26,6 @@ % } else { % die "unrecognized expiration date format: $date"; % } -% - <INPUT TYPE="hidden" NAME="exp_month" VALUE="<% $mon %>"> <INPUT TYPE="hidden" NAME="exp_year" VALUE="<% $year %>"> @@ -57,12 +39,10 @@ <INPUT TYPE="hidden" NAME="invoicing_list" VALUE="<% join(', ', @invoicing_list) %>"> </FORM> + % } else { % % my $r = qq!<font color="#ff0000">*</font> !; -% -% - <BR>Billing information <% &ntable("#cccccc") %> @@ -137,19 +117,14 @@ +'<div>[iframe not supported]</div></iframe>'); } </SCRIPT> -% -% -% my($payby, $paymask, $payname)=( -% $cust_main->payby, -% $cust_main->paymask, -% $cust_main->payname, -% ); -% my( $account, $aba ) = split('@', $paymask); + +% my $payby = $cust_main->payby; +% my( $account, $aba ) = split('@', $payinfo); % % my $disabled = 'DISABLED style="background-color: #dddddd"'; % my $text_disabled = 'style="color: #999999"'; % -% if ( $payby =~ /^(CARD|DCRD)$/ && cardtype($paymask) =~ /^(Switch|Solo)$/ ) { +% if ( $payby =~ /^(CARD|DCRD)$/ && cardtype($payinfo) =~ /^(Switch|Solo)$/ ) { % $disabled = 'style="background-color: #ffffff"'; % $text_disabled = 'style="color: #000000";' % } @@ -161,7 +136,7 @@ % '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'. % % qq!<TR><TD ALIGN="right" WIDTH="200">${r}Card number </TD>!. -% qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payinfo" VALUE="!. ( $payby =~ /^(CARD|DCRD)$/ ? $paymask : '' ). qq!" MAXLENGTH=19 onChange="card_changed(this)" onKeyUp="card_changed(this)"></TD></TR>!. +% qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payinfo" VALUE="!. ( $payby =~ /^(CARD|DCRD)$/ ? $payinfo : '' ). qq!" MAXLENGTH=19 onChange="card_changed(this)" onKeyUp="card_changed(this)"></TD></TR>!. % % qq!<TR><TD ALIGN="right" WIDTH="200">${r}Expiration </TD>!. % '<TD WIDTH="408">'. @@ -192,7 +167,7 @@ % 'end_year' => (localtime())[5] + 1900, % 'selected_date' => ( % ( $payby =~ /^(CARD|DCRD)$/ -% && cardtype($paymask) =~ /^(Switch|Solo)$/ ) +% && cardtype($payinfo) =~ /^(Switch|Solo)$/ ) % ? $cust_main->paystart_month. '-'. % $cust_main->paystart_year % : '' @@ -240,7 +215,7 @@ % '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'. % % qq!<TR><TD ALIGN="right" WIDTH="200">${r}Phone number </TD>!. -% qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payinfo" VALUE="!. ( $payby eq 'LECB' ? $cust_main->paymask : '' ). qq!" MAXLENGTH=15 SIZE=16></TD></TR>!. +% qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payinfo" VALUE="!. ( $payby eq 'LECB' ? $cust_main->payinfo : '' ). qq!" MAXLENGTH=15 SIZE=16></TD></TR>!. % % qq!<INPUT TYPE="hidden" NAME="exp_month" VALUE="12">!. % qq!<INPUT TYPE="hidden" NAME="exp_year" VALUE="2037">!. @@ -260,7 +235,7 @@ % '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'. % % qq!<TR><TD ALIGN="right" WIDTH="200">P.O. </TD>!. -% qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payinfo" VALUE="!. ( $payby eq 'BILL' ? $cust_main->paymask : '' ). qq!"></TD></TR>!. +% qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payinfo" VALUE="!. ( $payby eq 'BILL' ? $cust_main->payinfo : '' ). qq!"></TD></TR>!. % % qq!<INPUT TYPE="hidden" NAME="exp_month" VALUE="12">!. % qq!<INPUT TYPE="hidden" NAME="exp_year" VALUE="2037">!. @@ -451,4 +426,17 @@ <% $r %> required fields % } +<%init> + +my( $cust_main, %options ) = @_; +my @invoicing_list = @{ $options{'invoicing_list'} }; +my $payinfo = $options{'payinfo'}; +my $conf = new FS::Conf; +my $payby_default = $conf->config('payby-default'); + +my @payby = grep /\w/, $conf->config('payby'); +#@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP )) +@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP )) + unless @payby; +</%init> |