[freeside-commits] branch FREESIDE_4_BRANCH updated. e6816187d01802db8abdf31bd6d0de55bd081021

[Jonathan Prykop]

The branch, FREESIDE_4_BRANCH has been updated
       via  e6816187d01802db8abdf31bd6d0de55bd081021 (commit)
       via  8340c04a79bbce239396608dba53b82d9ad7f2f5 (commit)
      from  dd9dd7a913cd8da4d97b1c72522e016562a98459 (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 e6816187d01802db8abdf31bd6d0de55bd081021
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Wed Nov 4 00:44:52 2015 -0600

    RT#38314: Declined payment shows card as tokenized after first attempt [fixed if paymask is not passed, take 2]

diff --git a/FS/FS/cust_main/Billing_Realtime.pm b/FS/FS/cust_main/Billing_Realtime.pm
index d8e2c7c..c700cf7 100644
--- a/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@ -267,7 +267,10 @@ sub _bop_defaults {
     }
   }
 
-  $options->{payinfo} = $self->payinfo unless exists( $options->{payinfo} );
+  unless ( exists( $options->{'payinfo'} ) ) {
+    $options->{'payinfo'} = $self->payinfo;
+    $options->{'paymask'} = $self->paymask;
+  }
 
   # Default invoice number if the customer has exactly one open invoice.
   if( ! $options->{'invnum'} ) {

commit 8340c04a79bbce239396608dba53b82d9ad7f2f5
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Wed Nov 4 00:21:03 2015 -0600

    RT#38314: Declined payment shows card as tokenized after first attempt [fixed if paymask is not passed]

diff --git a/FS/FS/cust_main/Billing_Realtime.pm b/FS/FS/cust_main/Billing_Realtime.pm
index 403d8dd..d8e2c7c 100644
--- a/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@ -889,7 +889,7 @@ sub _realtime_bop_result {
        '_date'    => '',
        'payby'    => $cust_pay_pending->payby,
        'payinfo'  => $options{'payinfo'},
-       'paymask'  => $options{'paymask'},
+       'paymask'  => $options{'paymask'} || $cust_pay_pending->paymask,
        'paydate'  => $cust_pay_pending->paydate,
        'pkgnum'   => $cust_pay_pending->pkgnum,
        'discount_term'  => $options{'discount_term'},

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main/Billing_Realtime.pm |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)