projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
cust_main
/
Billing_Realtime.pm
diff --git
a/FS/FS/cust_main/Billing_Realtime.pm
b/FS/FS/cust_main/Billing_Realtime.pm
index
c676607
..
0fc2cb7
100644
(file)
--- a/
FS/FS/cust_main/Billing_Realtime.pm
+++ b/
FS/FS/cust_main/Billing_Realtime.pm
@@
-5,7
+5,7
@@
use vars qw( $conf $DEBUG $me );
use vars qw( $realtime_bop_decline_quiet ); #ugh
use Carp;
use Data::Dumper;
use vars qw( $realtime_bop_decline_quiet ); #ugh
use Carp;
use Data::Dumper;
-use Business::CreditCard 0.
28
;
+use Business::CreditCard 0.
35
;
use FS::UID qw( dbh );
use FS::Record qw( qsearch qsearchs );
use FS::payby;
use FS::UID qw( dbh );
use FS::Record qw( qsearch qsearchs );
use FS::payby;
@@
-510,11
+510,8
@@
sub realtime_bop {
$paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
$content{expiration} = "$2/$1";
$paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
$content{expiration} = "$2/$1";
- my $paycvv = exists($options{'paycvv'})
- ? $options{'paycvv'}
- : $self->paycvv;
- $content{cvv2} = $paycvv
- if length($paycvv);
+ $content{cvv2} = $options{'paycvv'}
+ if length($options{'paycvv'});
my $paystart_month = exists($options{'paystart_month'})
? $options{'paystart_month'}
my $paystart_month = exists($options{'paystart_month'})
? $options{'paystart_month'}
@@
-764,10
+761,10
@@
sub realtime_bop {
###
# compare to FS::cust_main::save_cust_payby - check both to make sure working correctly
###
# compare to FS::cust_main::save_cust_payby - check both to make sure working correctly
- if ( length($
self->paycvv
)
+ if ( length($
options{'paycvv'}
)
&& ! grep { $_ eq cardtype($options{payinfo}) } $conf->config('cvv-save')
) {
&& ! grep { $_ eq cardtype($options{payinfo}) } $conf->config('cvv-save')
) {
- my $error = $self->remove_cvv;
+ my $error = $self->remove_cvv
_from_cust_payby($options{payinfo})
;
if ( $error ) {
warn "WARNING: error removing cvv: $error\n";
}
if ( $error ) {
warn "WARNING: error removing cvv: $error\n";
}
@@
-1790,11
+1787,8
@@
sub realtime_verify_bop {
$paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
$content{expiration} = "$2/$1";
$paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
$content{expiration} = "$2/$1";
- my $paycvv = exists($options{'paycvv'})
- ? $options{'paycvv'}
- : $self->paycvv;
- $content{cvv2} = $paycvv
- if length($paycvv);
+ $content{cvv2} = $options{'paycvv'}
+ if length($options{'paycvv'});
my $paystart_month = exists($options{'paystart_month'})
? $options{'paystart_month'}
my $paystart_month = exists($options{'paystart_month'})
? $options{'paystart_month'}