projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
799da5a
)
multiple payment options (remove cust_main.payby reporting options), RT#23741
author
Ivan Kohler
<ivan@freeside.biz>
Mon, 16 Feb 2015 06:09:41 +0000
(22:09 -0800)
committer
Ivan Kohler
<ivan@freeside.biz>
Mon, 16 Feb 2015 06:09:41 +0000
(22:09 -0800)
FS/FS/cust_bill/Search.pm
patch
|
blob
|
history
FS/FS/cust_event.pm
patch
|
blob
|
history
httemplate/search/cust_bill.html
patch
|
blob
|
history
httemplate/search/cust_bill_void.html
patch
|
blob
|
history
httemplate/search/cust_event.html
patch
|
blob
|
history
httemplate/search/report_cust_bill.html
patch
|
blob
|
history
httemplate/search/report_cust_bill_pkg.html
patch
|
blob
|
history
httemplate/search/report_cust_bill_void.html
patch
|
blob
|
history
httemplate/search/report_cust_credit_bill_pkg.html
patch
|
blob
|
history
httemplate/search/report_cust_credit_source_bill_pkg.html
patch
|
blob
|
history
httemplate/search/report_cust_event.html
patch
|
blob
|
history
diff --git
a/FS/FS/cust_bill/Search.pm
b/FS/FS/cust_bill/Search.pm
index
1fc818d
..
2a67529
100644
(file)
--- 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).
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.
=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}};
#_date
if ( $param->{_date} ) {
my($beginning, $ending) = @{$param->{_date}};
diff --git
a/FS/FS/cust_event.pm
b/FS/FS/cust_event.pm
index
d7a35a7
..
f299f93
100644
(file)
--- 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 ending
-=item payby
-
-=item
-
=back
=cut
=back
=cut
diff --git
a/httemplate/search/cust_bill.html
b/httemplate/search/cust_bill.html
index
bd302c6
..
0820733
100755
(executable)
--- 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
}
#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;
}
$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
d99f759
..
38bbf45
100644
(file)
--- 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;
}
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') ];
#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
f1b9951
..
757982b
100644
(file)
--- a/
httemplate/search/cust_event.html
+++ b/
httemplate/search/cust_event.html
@@
-163,7
+163,7
@@
for my $param (@scalars) {
}
#lists
}
#lists
-my @lists = qw(
payby
eventpart );
+my @lists = qw( eventpart );
foreach my $param (@lists) {
$search{$param} = [ $cgi->param($param) ];
}
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
8734467
..
3efe830
100644
(file)
--- a/
httemplate/search/report_cust_bill.html
+++ b/
httemplate/search/report_cust_bill.html
@@
-33,17
+33,6
@@
'all_selected' => 1,
&>
'all_selected' => 1,
&>
-% if ( $cust_main ) {
- <INPUT TYPE="hidden" NAME="payby" VALUE="<% $cust_main->payby %>">
-% } else {
- <& /elements/tr-select-payby.html,
- label => emt('Payment method:'),
- payby_type => 'cust',
- multiple => 1,
- all_selected => 1,
- &>
-% }
-
</TABLE>
<BR>
</TABLE>
<BR>
diff --git
a/httemplate/search/report_cust_bill_pkg.html
b/httemplate/search/report_cust_bill_pkg.html
index
e1b45ec
..
9dc8b16
100644
(file)
--- a/
httemplate/search/report_cust_bill_pkg.html
+++ b/
httemplate/search/report_cust_bill_pkg.html
@@
-32,15
+32,6
@@
&>
-->
&>
-->
-<!-- customer payment method i guess
- <& /elements/tr-select-payby.html,
- label => emt('Payment method:'),
- payby_type => 'cust',
- multiple => 1,
- all_selected => 1,
- &>
--->
-
<TR>
<TD ALIGN="right"><INPUT TYPE="checkbox" NAME="nottax" VALUE="Y" onClick="nottax_changed(this)" onChange="nottax_change(thid)"></TD>
<TD><% mt('Omit taxes') |h %></TD>
<TR>
<TD ALIGN="right"><INPUT TYPE="checkbox" NAME="nottax" VALUE="Y" onClick="nottax_changed(this)" onChange="nottax_change(thid)"></TD>
<TD><% mt('Omit taxes') |h %></TD>
diff --git
a/httemplate/search/report_cust_bill_void.html
b/httemplate/search/report_cust_bill_void.html
index
cb13b78
..
91209ae
100644
(file)
--- a/
httemplate/search/report_cust_bill_void.html
+++ b/
httemplate/search/report_cust_bill_void.html
@@
-28,17
+28,6
@@
'all_selected' => 1,
&>
'all_selected' => 1,
&>
-% if ( $cust_main ) {
- <INPUT TYPE="hidden" NAME="payby" VALUE="<% $cust_main->payby %>">
-% } else {
- <& /elements/tr-select-payby.html,
- label => emt('Payment method:'),
- payby_type => 'cust',
- multiple => 1,
- all_selected => 1,
- &>
-% }
-
</TABLE>
<BR>
</TABLE>
<BR>
diff --git
a/httemplate/search/report_cust_credit_bill_pkg.html
b/httemplate/search/report_cust_credit_bill_pkg.html
index
1754032
..
ad0f3f6
100644
(file)
--- a/
httemplate/search/report_cust_credit_bill_pkg.html
+++ b/
httemplate/search/report_cust_credit_bill_pkg.html
@@
-41,15
+41,6
@@
field => 'amount',
&>
field => 'amount',
&>
-<!-- customer payment method i guess
- <& /elements/tr-select-payby.html,
- label => emt('Payment method:'),
- payby_type => 'cust',
- multiple => 1,
- all_selected => 1,
- &>
--->
-
<!--
<TR>
<TD ALIGN="right"><INPUT TYPE="checkbox" NAME="nottax" VALUE="Y" onClick="nottax_changed(this)" onChange="nottax_change(thid)"></TD>
<!--
<TR>
<TD ALIGN="right"><INPUT TYPE="checkbox" NAME="nottax" VALUE="Y" onClick="nottax_changed(this)" onChange="nottax_change(thid)"></TD>
diff --git
a/httemplate/search/report_cust_credit_source_bill_pkg.html
b/httemplate/search/report_cust_credit_source_bill_pkg.html
index
05f21c0
..
b579b92
100644
(file)
--- a/
httemplate/search/report_cust_credit_source_bill_pkg.html
+++ b/
httemplate/search/report_cust_credit_source_bill_pkg.html
@@
-44,15
+44,6
@@
&>
-->
&>
-->
-<!-- customer payment method in a 4.x world? huh. how's that work?
- <& /elements/tr-select-payby.html,
- label => emt('Payment method:'),
- payby_type => 'cust',
- multiple => 1,
- all_selected => 1,
- &>
--->
-
</TABLE>
<BR>
</TABLE>
<BR>
diff --git
a/httemplate/search/report_cust_event.html
b/httemplate/search/report_cust_event.html
index
e0d6242
..
0dd98d4
100644
(file)
--- 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,
<% include( '/elements/tr-select-part_event.html',
'label' => 'Events',
'multiple' => 1,