projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix payment report multiple selection vs. mysql, RT#29830
[freeside.git]
/
httemplate
/
search
/
elements
/
cust_pay_or_refund.html
diff --git
a/httemplate/search/elements/cust_pay_or_refund.html
b/httemplate/search/elements/cust_pay_or_refund.html
index
234121f
..
8aece0c
100755
(executable)
--- a/
httemplate/search/elements/cust_pay_or_refund.html
+++ b/
httemplate/search/elements/cust_pay_or_refund.html
@@
-108,7
+108,7
@@
my $cust_link = sub {
# only valid for $table == 'cust_pay' atm
my $tax_names = '';
if ( $cgi->param('tax_names') ) {
# only valid for $table == 'cust_pay' atm
my $tax_names = '';
if ( $cgi->param('tax_names') ) {
- if ( dbh->{Driver}->{Name}
eq 'Pg'
) {
+ if ( dbh->{Driver}->{Name}
=~ /^Pg/i
) {
$tax_names = "
array_to_string(
$tax_names = "
array_to_string(
@@
-167,7
+167,7
@@
push @links, '', '';
push @fields, 'payby_payinfo_pretty',
sub { sprintf('$%.2f', shift->$amount_field() ) },
;
push @fields, 'payby_payinfo_pretty',
sub { sprintf('$%.2f', shift->$amount_field() ) },
;
-push @link_onclicks, $sub_receipt, ''
,
+push @link_onclicks, $sub_receipt, ''
;
push @sort_fields, '', $amount_field;
if ( $unapplied ) {
push @sort_fields, '', $amount_field;
if ( $unapplied ) {
@@
-271,7
+271,7
@@
if ( $cgi->param('magic') ) {
foreach my $payby ( $cgi->param('payby') ) {
$payby =~
foreach my $payby ( $cgi->param('payby') ) {
$payby =~
- /^(CARD|CHEK|BILL|
PREP|CASH|WEST
|MCRD)(-(VisaMC|Amex|Discover|Maestro|Tokenized))?$/
+ /^(CARD|CHEK|BILL|
CASH|PPAL|APPL|ANRD|PREP|WIRE|WEST|EDI
|MCRD)(-(VisaMC|Amex|Discover|Maestro|Tokenized))?$/
or die "illegal payby $payby";
my $payby_search = "$table.payby = '$1'";
or die "illegal payby $payby";
my $payby_search = "$table.payby = '$1'";
@@
-280,6
+280,11
@@
if ( $cgi->param('magic') ) {
my $cardtype = $3;
my $cardtype = $3;
+ my $similar_to = dbh->{Driver}->{Name} =~ /^mysql/i
+ ? 'REGEXP' #doesn't behave exactly the same, but
+ #should work for our patterns
+ : 'SIMILAR TO';
+
my $search;
if ( $cardtype eq 'VisaMC' ) {
my $search;
if ( $cardtype eq 'VisaMC' ) {
@@
-288,15
+293,15
@@
if ( $cgi->param('magic') ) {
" ( ( substring($table.payinfo from 1 for 1) = '4' ".
" AND substring($table.payinfo from 1 for 4) != '4936' ".
" AND substring($table.payinfo from 1 for 6) ".
" ( ( substring($table.payinfo from 1 for 1) = '4' ".
" AND substring($table.payinfo from 1 for 4) != '4936' ".
" AND substring($table.payinfo from 1 for 6) ".
- " NOT
SIMILAR TO
'49030[2-9]' ".
+ " NOT
$similar_to
'49030[2-9]' ".
" AND substring($table.payinfo from 1 for 6) ".
" AND substring($table.payinfo from 1 for 6) ".
- " NOT
SIMILAR TO
'49033[5-9]' ".
+ " NOT
$similar_to
'49033[5-9]' ".
" AND substring($table.payinfo from 1 for 6) ".
" AND substring($table.payinfo from 1 for 6) ".
- " NOT
SIMILAR TO
'49110[1-2]' ".
+ " NOT
$similar_to
'49110[1-2]' ".
" AND substring($table.payinfo from 1 for 6) ".
" AND substring($table.payinfo from 1 for 6) ".
- " NOT
SIMILAR TO
'49117[4-9]' ".
+ " NOT
$similar_to
'49117[4-9]' ".
" AND substring($table.payinfo from 1 for 6) ".
" AND substring($table.payinfo from 1 for 6) ".
- " NOT
SIMILAR TO
'49118[1-2]' ".
+ " NOT
$similar_to
'49118[1-2]' ".
" )".
" OR substring($table.payinfo from 1 for 2) = '51' ".
" OR substring($table.payinfo from 1 for 2) = '52' ".
" )".
" OR substring($table.payinfo from 1 for 2) = '51' ".
" OR substring($table.payinfo from 1 for 2) = '52' ".
@@
-360,15
+365,15
@@
if ( $cgi->param('magic') ) {
" OR substring($table.payinfo from 1 for 6 ) = '564182' ".
" OR substring($table.payinfo from 1 for 4 ) = '4936' ".
" OR substring($table.payinfo from 1 for 6 ) ".
" OR substring($table.payinfo from 1 for 6 ) = '564182' ".
" OR substring($table.payinfo from 1 for 4 ) = '4936' ".
" OR substring($table.payinfo from 1 for 6 ) ".
- "
SIMILAR TO
'49030[2-9]' ".
+ "
$similar_to
'49030[2-9]' ".
" OR substring($table.payinfo from 1 for 6 ) ".
" OR substring($table.payinfo from 1 for 6 ) ".
- "
SIMILAR TO
'49033[5-9]' ".
+ "
$similar_to
'49033[5-9]' ".
" OR substring($table.payinfo from 1 for 6 ) ".
" OR substring($table.payinfo from 1 for 6 ) ".
- "
SIMILAR TO
'49110[1-2]' ".
+ "
$similar_to
'49110[1-2]' ".
" OR substring($table.payinfo from 1 for 6 ) ".
" OR substring($table.payinfo from 1 for 6 ) ".
- "
SIMILAR TO
'49117[4-9]' ".
+ "
$similar_to
'49117[4-9]' ".
" OR substring($table.payinfo from 1 for 6 ) ".
" OR substring($table.payinfo from 1 for 6 ) ".
- "
SIMILAR TO
'49118[1-2]' ".
+ "
$similar_to
'49118[1-2]' ".
" ) ";
} elsif ( $cardtype eq 'Tokenized' ) {
" ) ";
} elsif ( $cardtype eq 'Tokenized' ) {
@@
-440,8
+445,6
@@
if ( $cgi->param('magic') ) {
$cgi->param('paybatch') =~ /^([\w\/\:\-\.]+)$/
or die "illegal paybatch: ". $cgi->param('paybatch');
$cgi->param('paybatch') =~ /^([\w\/\:\-\.]+)$/
or die "illegal paybatch: ". $cgi->param('paybatch');
- push @search, "paybatch = '$1'";
-
$orderby = "LOWER(company || ' ' || last || ' ' || first )";
} elsif ( $cgi->param('magic') eq 'batchnum' ) {
$orderby = "LOWER(company || ' ' || last || ' ' || first )";
} elsif ( $cgi->param('magic') eq 'batchnum' ) {
@@
-457,6
+460,10
@@
if ( $cgi->param('magic') ) {
die "unknown search magic: ". $cgi->param('magic');
}
die "unknown search magic: ". $cgi->param('magic');
}
+ if ( $cgi->param('paybatch') =~ /^([\w\/\:\-\.]+)$/ ) {
+ push @search, "paybatch = '$1'";
+ }
+
#unapplied payment/refund
if ( $unapplied ) {
push @select, '(' . "FS::$table"->unapplied_sql . ') AS unapplied_amount';
#unapplied payment/refund
if ( $unapplied ) {
push @select, '(' . "FS::$table"->unapplied_sql . ') AS unapplied_amount';
@@
-486,7
+493,7
@@
if ( $cgi->param('magic') ) {
my $group_by = '';
if ( $cgi->param('tax_names') ) {
my $group_by = '';
if ( $cgi->param('tax_names') ) {
- if ( dbh->{Driver}->{Name}
eq 'Pg'
) {
+ if ( dbh->{Driver}->{Name}
=~ /^Pg/i
) {
0;#twiddle thumbs
0;#twiddle thumbs