From 98a3a04b6dfbde0bdd2b27c6f5538daf211a3db9 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sun, 15 Feb 2015 22:09:41 -0800 Subject: [PATCH] multiple payment options (remove cust_main.payby reporting options), RT#23741 --- FS/FS/cust_bill/Search.pm | 12 ------------ FS/FS/cust_event.pm | 4 ---- httemplate/search/cust_bill.html | 2 +- httemplate/search/cust_bill_void.html | 4 ---- httemplate/search/cust_event.html | 2 +- httemplate/search/report_cust_bill.html | 11 ----------- httemplate/search/report_cust_bill_pkg.html | 9 --------- httemplate/search/report_cust_bill_void.html | 11 ----------- httemplate/search/report_cust_credit_bill_pkg.html | 9 --------- httemplate/search/report_cust_credit_source_bill_pkg.html | 9 --------- httemplate/search/report_cust_event.html | 8 -------- 11 files changed, 2 insertions(+), 79 deletions(-) diff --git a/FS/FS/cust_bill/Search.pm b/FS/FS/cust_bill/Search.pm index 1fc818d35..2a67529c1 100644 --- a/FS/FS/cust_bill/Search.pm +++ b/FS/FS/cust_bill/Search.pm @@ -128,10 +128,6 @@ Return only invoices belonging to that customer. Limit to that customer class (single value or arrayref). -=item payby - -Limit to customers with that payment method (single value or arrayref). - =item refnum Limit to customers with that advertising source. @@ -194,14 +190,6 @@ sub search_sql_where { } - #payby - if ( $param->{payby} ) { - my $payby = $param->{payby}; - $payby = [ $payby ] unless ref $payby; - my $payby_in = join(',', map {dbh->quote($_)} @$payby); - push @search, "cust_main.payby IN($payby_in)" if length($payby_in); - } - #_date if ( $param->{_date} ) { my($beginning, $ending) = @{$param->{_date}}; diff --git a/FS/FS/cust_event.pm b/FS/FS/cust_event.pm index d7a35a7a9..f299f9377 100644 --- a/FS/FS/cust_event.pm +++ b/FS/FS/cust_event.pm @@ -337,10 +337,6 @@ specified in HASHREF. Valid parameters are =item ending -=item payby - -=item - =back =cut diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html index bd302c64f..082073339 100755 --- a/httemplate/search/cust_bill.html +++ b/httemplate/search/cust_bill.html @@ -119,7 +119,7 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) { } #arrays - for my $param (qw( cust_classnum payby )) { + for my $param (qw( cust_classnum )) { $search{$param} = [ $cgi->param($param) ] if grep { $_ eq $param } $cgi->param; } diff --git a/httemplate/search/cust_bill_void.html b/httemplate/search/cust_bill_void.html index d99f759bd..38bbf45f8 100644 --- a/httemplate/search/cust_bill_void.html +++ b/httemplate/search/cust_bill_void.html @@ -124,10 +124,6 @@ if ( grep { $_ eq 'cust_classnum' } $cgi->param ) { if ( $cgi->param('invnum_max') =~ /^\s*(\d+)\s*$/ ) { $search{'invnum_max'} = $1; } - #payby - if ( $cgi->param('payby') ) { - $search{'payby'} = [ $cgi->param('payby') ]; - } #amounts $search{'charged'} = [ FS::UI::Web::parse_lt_gt($cgi, 'charged') ]; diff --git a/httemplate/search/cust_event.html b/httemplate/search/cust_event.html index f1b99510a..757982b95 100644 --- a/httemplate/search/cust_event.html +++ b/httemplate/search/cust_event.html @@ -163,7 +163,7 @@ for my $param (@scalars) { } #lists -my @lists = qw( payby eventpart ); +my @lists = qw( eventpart ); foreach my $param (@lists) { $search{$param} = [ $cgi->param($param) ]; } diff --git a/httemplate/search/report_cust_bill.html b/httemplate/search/report_cust_bill.html index 8734467a4..3efe830e3 100644 --- a/httemplate/search/report_cust_bill.html +++ b/httemplate/search/report_cust_bill.html @@ -33,17 +33,6 @@ 'all_selected' => 1, &> -% if ( $cust_main ) { - -% } else { - <& /elements/tr-select-payby.html, - label => emt('Payment method:'), - payby_type => 'cust', - multiple => 1, - all_selected => 1, - &> -% } -
diff --git a/httemplate/search/report_cust_bill_pkg.html b/httemplate/search/report_cust_bill_pkg.html index e1b45ece9..9dc8b165a 100644 --- a/httemplate/search/report_cust_bill_pkg.html +++ b/httemplate/search/report_cust_bill_pkg.html @@ -32,15 +32,6 @@ &> --> - - <% mt('Omit taxes') |h %> diff --git a/httemplate/search/report_cust_bill_void.html b/httemplate/search/report_cust_bill_void.html index cb13b785a..91209aeba 100644 --- a/httemplate/search/report_cust_bill_void.html +++ b/httemplate/search/report_cust_bill_void.html @@ -28,17 +28,6 @@ 'all_selected' => 1, &> -% if ( $cust_main ) { - -% } else { - <& /elements/tr-select-payby.html, - label => emt('Payment method:'), - payby_type => 'cust', - multiple => 1, - all_selected => 1, - &> -% } -
diff --git a/httemplate/search/report_cust_credit_bill_pkg.html b/httemplate/search/report_cust_credit_bill_pkg.html index 175403219..ad0f3f62e 100644 --- a/httemplate/search/report_cust_credit_bill_pkg.html +++ b/httemplate/search/report_cust_credit_bill_pkg.html @@ -41,15 +41,6 @@ field => 'amount', &> - - - -
diff --git a/httemplate/search/report_cust_event.html b/httemplate/search/report_cust_event.html index e0d6242b2..0dd98d479 100644 --- a/httemplate/search/report_cust_event.html +++ b/httemplate/search/report_cust_event.html @@ -19,14 +19,6 @@ ) %> - <% include( '/elements/tr-select-payby.html', - 'label' => 'Customer payment type', - 'payby_type' => 'cust', - 'multiple' => 1, - 'all_selected' => 1, - ) - %> - <% include( '/elements/tr-select-part_event.html', 'label' => 'Events', 'multiple' => 1, -- 2.11.0