From a0e3c43f10daaff70886197ff40a47d92f2c345b Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sat, 24 Oct 2015 15:44:27 -0700 Subject: remove obsolete usage of payby config, western union payments, etc., RT#23741 --- httemplate/view/cust_bill.cgi | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) (limited to 'httemplate/view/cust_bill.cgi') diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi index 2ff3ca883..8884ddea4 100755 --- a/httemplate/view/cust_bill.cgi +++ b/httemplate/view/cust_bill.cgi @@ -19,7 +19,6 @@ function areyousure(href, message) { % } % if ( $cust_bill->owed > 0 -% && scalar( grep $payby{$_}, qw(BILL CASH WEST MCRD MCHK) ) % && $curuser->access_right(['Post payment', 'Post check payment', 'Post cash payment']) % && ! $conf->exists('pkg-balances') % ) @@ -28,30 +27,30 @@ function areyousure(href, message) { <% mt('Post') |h %> -% if ( $payby{'BILL'} && $curuser->access_right(['Post payment', 'Post check payment']) ) { +% if ( $curuser->access_right(['Post payment', 'Post check payment']) ) { <% $s++ ? ' | ' : '' %> <% mt('check') |h %> % } -% if ( $payby{'CASH'} && $curuser->access_right(['Post payment', 'Post cash payment']) ) { +% if ( $curuser->access_right(['Post payment', 'Post cash payment']) ) { <% $s++ ? ' | ' : '' %> <% mt('cash') |h %> % } -% if ( $payby{'WEST'} && $curuser->access_right(['Post payment']) ) { - <% $s++ ? ' | ' : '' %> - <% mt('Western Union') |h %> -% } - -% if ( $payby{'MCRD'} && $curuser->access_right(['Post payment']) ) { - <% $s++ ? ' | ' : '' %> - <% mt('manual credit card') |h %> -% } - -% if ( $payby{'MCHK'} && $curuser->access_right(['Post payment']) ) { - <% $s++ ? ' | ' : '' %> - <% mt('manual electronic check') |h %> -% } +%# % if ( $payby{'WEST'} && $curuser->access_right(['Post payment']) ) { +%# <% $s++ ? ' | ' : '' %> +%# <% mt('Western Union') |h %> +%# % } +%# +%# % if ( $payby{'MCRD'} && $curuser->access_right(['Post payment']) ) { +%# <% $s++ ? ' | ' : '' %> +%# <% mt('manual credit card') |h %> +%# % } +%# +%# % if ( $payby{'MCHK'} && $curuser->access_right(['Post payment']) ) { +%# <% $s++ ? ' | ' : '' %> +%# <% mt('manual electronic check') |h %> +%# % } <% mt('payment against this invoice') |h %>

@@ -167,11 +166,6 @@ my %opt = ( $opt{'barcode_img'} = 1 if $conf->exists('invoice-barcode'); -my @payby = grep /\w/, $conf->config('payby'); -@payby = (qw( CARD DCRD CHEK DCHK BILL CASH )) - unless @payby; -my %payby = map { $_=>1 } @payby; - my $cust_bill = qsearchs({ 'select' => 'cust_bill.*', 'table' => 'cust_bill', -- cgit v1.2.1