projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
050e311
)
rename cardtype to paycardtype
author
Mark Wells
<mark@freeside.biz>
Fri, 15 Jul 2016 22:50:27 +0000
(15:50 -0700)
committer
Mark Wells
<mark@freeside.biz>
Thu, 11 Aug 2016 22:34:05 +0000
(15:34 -0700)
FS/FS/Schema.pm
patch
|
blob
|
history
FS/FS/Upgrade.pm
patch
|
blob
|
history
FS/FS/cust_pay.pm
patch
|
blob
|
history
FS/FS/cust_refund.pm
patch
|
blob
|
history
FS/FS/payinfo_Mixin.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Schema.pm
b/FS/FS/Schema.pm
index
f3fca2e
..
63c113c
100644
(file)
--- a/
FS/FS/Schema.pm
+++ b/
FS/FS/Schema.pm
@@
-1755,7
+1755,7
@@
sub tables_hashref {
# index into payby table
# eventually
'payinfo', 'varchar', 'NULL', 512, '', '', #see cust_main above
# index into payby table
# eventually
'payinfo', 'varchar', 'NULL', 512, '', '', #see cust_main above
- 'cardtype', 'varchar', 'NULL', $char_d, '', '',
+ '
pay
cardtype', 'varchar', 'NULL', $char_d, '', '',
'paymask', 'varchar', 'NULL', $char_d, '', '',
'paydate', 'varchar', 'NULL', 10, '', '',
'paybatch', 'varchar', 'NULL', $char_d, '', '', #for auditing purposes.
'paymask', 'varchar', 'NULL', $char_d, '', '',
'paydate', 'varchar', 'NULL', 10, '', '',
'paybatch', 'varchar', 'NULL', $char_d, '', '', #for auditing purposes.
@@
-1794,7
+1794,7
@@
sub tables_hashref {
# index into payby table
# eventually
'payinfo', 'varchar', 'NULL', 512, '', '', #see cust_main above
# index into payby table
# eventually
'payinfo', 'varchar', 'NULL', 512, '', '', #see cust_main above
- 'cardtype', 'varchar', 'NULL', $char_d, '', '',
+ '
pay
cardtype', 'varchar', 'NULL', $char_d, '', '',
'paymask', 'varchar', 'NULL', $char_d, '', '',
#'paydate' ?
'paybatch', 'varchar', 'NULL', $char_d, '', '', #for auditing purposes.
'paymask', 'varchar', 'NULL', $char_d, '', '',
#'paydate' ?
'paybatch', 'varchar', 'NULL', $char_d, '', '', #for auditing purposes.
@@
-2146,7
+2146,7
@@
sub tables_hashref {
# be index into payby
# table eventually
'payinfo', 'varchar', 'NULL', 512, '', '', #see cust_main above
# be index into payby
# table eventually
'payinfo', 'varchar', 'NULL', 512, '', '', #see cust_main above
- '
cardtype',
'varchar', 'NULL', $char_d, '', '',
+ '
paycardtype',
'varchar', 'NULL', $char_d, '', '',
'paymask', 'varchar', 'NULL', $char_d, '', '',
'paybatch', 'varchar', 'NULL', $char_d, '', '',
'closed', 'char', 'NULL', 1, '', '',
'paymask', 'varchar', 'NULL', $char_d, '', '',
'paybatch', 'varchar', 'NULL', $char_d, '', '',
'closed', 'char', 'NULL', 1, '', '',
diff --git
a/FS/FS/Upgrade.pm
b/FS/FS/Upgrade.pm
index
26cd42a
..
481646d
100644
(file)
--- a/
FS/FS/Upgrade.pm
+++ b/
FS/FS/Upgrade.pm
@@
-391,7
+391,7
@@
sub upgrade_data {
'cust_refund' => [],
'banned_pay' => [],
'cust_refund' => [],
'banned_pay' => [],
- #cardtype
+ #
pay
cardtype
'cust_payby' => [],
#default namespace
'cust_payby' => [],
#default namespace
diff --git
a/FS/FS/cust_pay.pm
b/FS/FS/cust_pay.pm
index
6676317
..
04aac4e
100644
(file)
--- a/
FS/FS/cust_pay.pm
+++ b/
FS/FS/cust_pay.pm
@@
-96,7
+96,7
@@
Payment Type (See L<FS::payinfo_Mixin> for valid values)
Payment Information (See L<FS::payinfo_Mixin> for data format)
Payment Information (See L<FS::payinfo_Mixin> for data format)
-=item cardtype
+=item
pay
cardtype
Credit card type, if appropriate; autodetected.
Credit card type, if appropriate; autodetected.
@@
-1248,7
+1248,7
@@
sub _upgrade_data { #class method
}
###
}
###
- # set cardtype
+ # set
pay
cardtype
###
$class->upgrade_set_cardtype;
###
$class->upgrade_set_cardtype;
diff --git
a/FS/FS/cust_refund.pm
b/FS/FS/cust_refund.pm
index
17bd13d
..
e26121b
100644
(file)
--- a/
FS/FS/cust_refund.pm
+++ b/
FS/FS/cust_refund.pm
@@
-83,7
+83,7
@@
Payment Type (See L<FS::payinfo_Mixin> for valid payby values)
Payment Information (See L<FS::payinfo_Mixin> for data format)
Payment Information (See L<FS::payinfo_Mixin> for data format)
-=item cardtype
+=item
pay
cardtype
Detected credit card type, if appropriate; autodetected.
Detected credit card type, if appropriate; autodetected.
diff --git
a/FS/FS/payinfo_Mixin.pm
b/FS/FS/payinfo_Mixin.pm
index
81e04a4
..
b02e98e
100644
(file)
--- a/
FS/FS/payinfo_Mixin.pm
+++ b/
FS/FS/payinfo_Mixin.pm
@@
-198,9
+198,12
@@
sub payinfo_check {
or return "Illegal payby: ". $self->payby;
if ( $self->payby eq 'CARD' && ! $self->is_encrypted($self->payinfo) ) {
or return "Illegal payby: ". $self->payby;
if ( $self->payby eq 'CARD' && ! $self->is_encrypted($self->payinfo) ) {
+
my $payinfo = $self->payinfo;
my $cardtype = cardtype($payinfo);
my $payinfo = $self->payinfo;
my $cardtype = cardtype($payinfo);
- $self->set('cardtype', $cardtype);
+ $cardtype = 'Tokenized' if $payinfo !~ /^99\d{14}$/;
+ $self->set('paycardtype', $cardtype);
+
if ( $ignore_masked_payinfo and $self->mask_payinfo eq $self->payinfo ) {
# allow it
} else {
if ( $ignore_masked_payinfo and $self->mask_payinfo eq $self->payinfo ) {
# allow it
} else {
@@
-211,8
+214,7
@@
sub payinfo_check {
or return "Illegal (mistyped?) credit card number (payinfo)";
$self->payinfo($1);
validate($self->payinfo) or return "Illegal credit card number";
or return "Illegal (mistyped?) credit card number (payinfo)";
$self->payinfo($1);
validate($self->payinfo) or return "Illegal credit card number";
- return "Unknown card type" if $self->payinfo !~ /^99\d{14}$/ #token
- && $cardtype eq "Unknown";
+ return "Unknown card type" if $cardtype eq "Unknown";
} else {
$self->payinfo('N/A'); #???
}
} else {
$self->payinfo('N/A'); #???
}
@@
-220,9
+222,9
@@
sub payinfo_check {
} else {
if ( $self->payby eq 'CARD' and $self->paymask ) {
# if we can't decrypt the card, at least detect the cardtype
} else {
if ( $self->payby eq 'CARD' and $self->paymask ) {
# if we can't decrypt the card, at least detect the cardtype
- $self->set('cardtype', cardtype($self->paymask));
+ $self->set('
pay
cardtype', cardtype($self->paymask));
} else {
} else {
- $self->set('cardtype', '');
+ $self->set('
pay
cardtype', '');
}
if ( $self->is_encrypted($self->payinfo) ) {
#something better? all it would cause is a decryption error anyway?
}
if ( $self->is_encrypted($self->payinfo) ) {
#something better? all it would cause is a decryption error anyway?
@@
-320,8
+322,8
@@
sub payinfo_used {
=item upgrade_set_cardtype
=item upgrade_set_cardtype
-Find all records with a credit card payment type and no cardtype, and
-replace them in order to set their cardtype.
+Find all records with a credit card payment type and no
pay
cardtype, and
+replace them in order to set their
pay
cardtype.
=cut
=cut
@@
-332,7
+334,7
@@
sub upgrade_set_cardtype {
local $ignore_masked_payinfo = 1;
my $search = FS::Cursor->new({
table => $class->table,
local $ignore_masked_payinfo = 1;
my $search = FS::Cursor->new({
table => $class->table,
- extra_sql => q[ WHERE payby IN('CARD','DCRD') AND cardtype IS NULL ],
+ extra_sql => q[ WHERE payby IN('CARD','DCRD') AND
pay
cardtype IS NULL ],
});
while (my $record = $search->fetch) {
my $error = $record->replace;
});
while (my $record = $search->fetch) {
my $error = $record->replace;