From bbf01f2a628d15c0ca557cf68235f25d6d233ee7 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 21 Nov 2005 12:41:43 +0000 Subject: [PATCH] ignore blank lines in payby config --- httemplate/edit/cust_main/billing.html | 4 ++-- httemplate/view/cust_bill.cgi | 4 ++-- httemplate/view/cust_main/payment_history.html | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html index 6168fa97e..1f557c84b 100644 --- a/httemplate/edit/cust_main/billing.html +++ b/httemplate/edit/cust_main/billing.html @@ -4,10 +4,10 @@ my( $cust_main ) = @_; my $conf = new FS::Conf; my $payby_default = $conf->config('payby-default'); -my @payby = $conf->config('payby'); +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 grep /\w/, @payby; + unless @payby; if ( $payby_default eq 'HIDE' ) { diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi index 572441494..56c0c1736 100755 --- a/httemplate/view/cust_bill.cgi +++ b/httemplate/view/cust_bill.cgi @@ -8,10 +8,10 @@ my $invnum = $3; my $conf = new FS::Conf; -my @payby = $conf->config('payby'); +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 grep /\w/, @payby; + unless @payby; my %payby = map { $_=>1 } @payby; my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum}); diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html index f794ccf4a..0eef2ad1c 100644 --- a/httemplate/view/cust_main/payment_history.html +++ b/httemplate/view/cust_main/payment_history.html @@ -4,10 +4,10 @@ my $conf = new FS::Conf; - my @payby = $conf->config('payby'); + 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 grep /\w/, @payby; + unless @payby; my %payby = map { $_=>1 } @payby; my $s = 0; -- 2.11.0