}
- if ( $self->paydate eq '' || $self->paydate eq '-' ) {
- return "Expiration date required"
- # shouldn't payinfo_check do this?
- unless $self->payby =~ /^(CHEK|DCHK)$/;
+ if ( $self->payby =~ /^(CHEK|DCHK)$/ ) {
+
$self->paydate('');
- } else {
+
+ } elsif ( $self->payby =~ /^(CARD|DCRD)$/ ) {
+
+ # shouldn't payinfo_check do this?
+ return "Expiration date required"
+ if $self->paydate eq '' || $self->paydate eq '-';
+
my( $m, $y );
if ( $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/ ) {
( $m, $y ) = ( $1, length($2) == 4 ? $2 : "20$2" );
#&&
!$ignore_expired_card
&& ( $y<$nowy || ( $y==$nowy && $1<$nowm ) );
+
}
if ( $self->payname eq '' && $self->payby !~ /^(CHEK|DCHK)$/ &&
sub cgi_cust_payby_fields {
#my $class = shift;
[qw( payby payinfo paydate_month paydate_year paycvv payname weight
- payinfo1 payinfo2 payinfo3 paytype paystate )];
+ payinfo1 payinfo2 payinfo3 paytype paystate payname_CHEK )];
}
=item cgi_hash_callback HASHREF
if ( $hashref->{payby} =~ /^(CHEK|DCHK)$/ ) {
- unless ( grep $hashref->{$_}, qw( payinfo1 payinfo2 payinfo3 payname ) ) {
+ unless ( grep $hashref->{$_}, qw(payinfo1 payinfo2 payinfo3 payname_CHEK)) {
%$hashref = ();
return;
}
if $conf->config('echeck-country') eq 'CA';
$hashref->{payinfo} .= $hashref->{'payinfo2'};
- $hashref->{payname} .= $hashref->{'payname_CHEK'};
+ $hashref->{payname} = $hashref->{'payname_CHEK'};
} elsif ( $hashref->{payby} =~ /^(CARD|DCRD)$/ ) {
</SELECT>
<BR><FONT SIZE="-1"><% mt('Account type') |h %></FONT>
</TD>
-
-% my( $account, $aba ) = split('@',
-% ( $cgi->param($name.'_payby') || $cust_payby->payby ) =~ /^(CHEK|DCHK)$/
-% ? $cgi->param($name.'_payinfo')
-% : $cust_payby->payinfo
-% );
-% my $branch = '';
-% ($branch,$aba) = split('\.',$aba)
-% if $echeck_country eq 'CA';
+
+% my ( $account, $aba, $branch ) = ( '', '', '' );
+% if ( $cgi->param($name.'_payby') =~ /^(CHEK|DCHK)$/ ) {
+% $account = $cgi->param($name.'_payinfo1');
+% $aba = $cgi->param($name.'_payinfo2');
+% $branch = $cgi->param($name.'_payinfo3');
+% } elsif ( $cust_payby->payby =~ /^(CHEK|DCHK)$/ ) {
+% ( $account, $aba ) = split('@', $cust_payby->payinfo);
+% ( $branch, $aba ) = split('\.',$aba)
+% if $echeck_country eq 'CA';
+% }
%
% #false laziness w/view/cust_main/billing.html and misc/payment.cgi
% my $routing_label = $echeck_country eq 'US' ? 'ABA/Routing #'
} else {
$cust_payby = new FS::cust_payby {};
}
-my $sel_payby = $cust_payby->payby;
+my $sel_payby = $cgi->param($name.'_payby') || $cust_payby->payby;
$sel_payby = 'CARD' if $sel_payby eq 'DCRD' || $sel_payby eq '';
$sel_payby = 'CHEK' if $sel_payby eq 'DCHK';