[freeside-commits] branch FREESIDE_3_BRANCH updated. 68607ca761342d39b0f7988c9a73ab2ba5d6a3ea
Ivan
ivan at 420.am
Tue May 14 18:45:43 PDT 2013
The branch, FREESIDE_3_BRANCH has been updated
via 68607ca761342d39b0f7988c9a73ab2ba5d6a3ea (commit)
from f3f24bc08631514d07673ae2dfdae0d6c833569d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 68607ca761342d39b0f7988c9a73ab2ba5d6a3ea
Author: Ivan Kohler <ivan at freeside.biz>
Date: Tue May 14 18:45:42 2013 -0700
add "Tokenized" card type to searches, RT#22953
diff --git a/httemplate/search/elements/cust_pay_or_refund.html b/httemplate/search/elements/cust_pay_or_refund.html
index 7b2a170..234121f 100755
--- a/httemplate/search/elements/cust_pay_or_refund.html
+++ b/httemplate/search/elements/cust_pay_or_refund.html
@@ -271,7 +271,7 @@ if ( $cgi->param('magic') ) {
foreach my $payby ( $cgi->param('payby') ) {
$payby =~
- /^(CARD|CHEK|BILL|PREP|CASH|WEST|MCRD)(-(VisaMC|Amex|Discover|Maestro))?$/
+ /^(CARD|CHEK|BILL|PREP|CASH|WEST|MCRD)(-(VisaMC|Amex|Discover|Maestro|Tokenized))?$/
or die "illegal payby $payby";
my $payby_search = "$table.payby = '$1'";
@@ -282,6 +282,7 @@ if ( $cgi->param('magic') ) {
my $search;
if ( $cardtype eq 'VisaMC' ) {
+
#avoid posix regexes for portability
$search =
" ( ( substring($table.payinfo from 1 for 1) = '4' ".
@@ -305,11 +306,14 @@ if ( $cgi->param('magic') ) {
" OR substring($table.payinfo from 1 for 2) = '55' ".
# " OR substring($table.payinfo from 1 for 2) = '36' ". #Diner's int'l was processed as Visa/MC inside US, now Discover
" ) ";
+
} elsif ( $cardtype eq 'Amex' ) {
+
$search =
" ( substring($table.payinfo from 1 for 2 ) = '34' ".
" OR substring($table.payinfo from 1 for 2 ) = '37' ".
" ) ";
+
} elsif ( $cardtype eq 'Discover' ) {
my $conf = new FS::Conf;
@@ -347,7 +351,9 @@ if ( $cgi->param('magic') ) {
).
" OR substring($table.payinfo from 1 for 3 ) = '622' ". #China Union Pay processed as Discover outside CN
" ) ";
- } elsif ( $cardtype eq 'Maestro' ) {
+
+ } elsif ( $cardtype eq 'Maestro' ) {
+
$search =
" ( substring($table.payinfo from 1 for 2 ) = '63' ".
" OR substring($table.payinfo from 1 for 2 ) = '67' ".
@@ -364,6 +370,11 @@ if ( $cgi->param('magic') ) {
" OR substring($table.payinfo from 1 for 6 ) ".
" SIMILAR TO '49118[1-2]' ".
" ) ";
+
+ } elsif ( $cardtype eq 'Tokenized' ) {
+
+ $search = " substring($table.payinfo from 1 for 2 ) = '99' ";
+
} else {
die "unknown card type $cardtype";
}
diff --git a/httemplate/search/elements/report_cust_pay_or_refund.html b/httemplate/search/elements/report_cust_pay_or_refund.html
index 0462f1c..cdbcee2 100644
--- a/httemplate/search/elements/report_cust_pay_or_refund.html
+++ b/httemplate/search/elements/report_cust_pay_or_refund.html
@@ -37,6 +37,7 @@ Examples:
<OPTION VALUE="CARD-Amex" SELECTED><% mt('credit card (American Express)') |h %></OPTION>
<OPTION VALUE="CARD-Discover" SELECTED><% mt('credit card (Discover)') |h %></OPTION>
<OPTION VALUE="CARD-Maestro" SELECTED><% mt('credit card (Maestro/Switch/Solo)') |h %></OPTION>
+ <OPTION VALUE="CARD-Tokenized" SELECTED><% mt('credit card (Tokenized)') |h %></OPTION>
<OPTION VALUE="CHEK" SELECTED><% mt('electronic check / ACH') |h %></OPTION>
<OPTION VALUE="BILL" SELECTED><% mt('check') |h %></OPTION>
<OPTION VALUE="PREP" SELECTED><% mt('prepaid card') |h %></OPTION>
-----------------------------------------------------------------------
Summary of changes:
httemplate/search/elements/cust_pay_or_refund.html | 15 +++++++++++++--
.../search/elements/report_cust_pay_or_refund.html | 1 +
2 files changed, 14 insertions(+), 2 deletions(-)
More information about the freeside-commits
mailing list