ignore blank lines in payby config

diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 6168fa9..1f557c8 100644 (file)
--- 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 5724414..56c0c17 100755 (executable)
--- 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 f794ccf..0eef2ad 100644 (file)
--- 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;