diff options
Diffstat (limited to 'httemplate/elements')
| -rw-r--r-- | httemplate/elements/cust_payby.html | 22 | ||||
| -rw-r--r-- | httemplate/elements/menu.html | 3 |
2 files changed, 12 insertions, 13 deletions
diff --git a/httemplate/elements/cust_payby.html b/httemplate/elements/cust_payby.html index 20ad34311..0eb3e3ebe 100644 --- a/httemplate/elements/cust_payby.html +++ b/httemplate/elements/cust_payby.html @@ -107,15 +107,17 @@ </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 #' @@ -287,7 +289,7 @@ if ( $curr_value ) { } 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'; diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index fe59ec540..669f59b54 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -317,8 +317,6 @@ tie my %report_ticketing, 'Tie::IxHash', tie my %report_bill_event, 'Tie::IxHash', 'All billing events' => [ $fsurl.'search/report_cust_event.html', 'All billing events for a date range' ], 'Billing event errors' => [ $fsurl.'search/report_cust_event.html?failed=1', 'Failed credit cards, processor or printer problems, etc.' ], -# 'All invoice events' => [ $fsurl.'search/cust_bill_event.html', 'Reports on deprecated, old-style invoice events for a date range' ], -# 'Invoice event errors' => [ $fsurl.'search/cust_bill_event.html?failed=1', 'Reports on deprecated, old-style events for failed credit cards, processor or printer problems, etc.' ], ; tie my %report_payments, 'Tie::IxHash', @@ -668,7 +666,6 @@ $config_billing{'Billing events'} = [ $fsurl.'browse/part_event.html', 'Billing if $curuser->access_right('Edit billing events') || $curuser->access_right('Edit global billing events'); if ( $curuser->access_right('Configuration') ) { - #$config_billing{'Invoice events'} = [ $fsurl.'browse/part_bill_event.cgi', 'Deprecated, old-style actions for overdue invoices' ]; $config_billing{'Invoice configurations'} = [ $fsurl.'browse/invoice_conf.html', 'Adjust invoice settings for special-purpose notices' ]; $config_billing{'Invoice templates'} = [ $fsurl.'browse/invoice_template.html', 'Edit templates for HTML, plaintext and typeset invoices' ]; $config_billing{'separator'} = ''; #its a separator! |