[freeside-commits] branch FREESIDE_3_BRANCH updated. f8c4741390077c1448d627949d19c9220cc8e610

Jonathan Prykop jonathan at 420.am
Thu Nov 5 18:21:38 PST 2015


The branch, FREESIDE_3_BRANCH has been updated
       via  f8c4741390077c1448d627949d19c9220cc8e610 (commit)
       via  96e1e42b99847bfc2ea9a56281b77fa5a4ac6f55 (commit)
      from  3399a25eba1da01491ede8a86cc99b5be0b1dfe8 (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 f8c4741390077c1448d627949d19c9220cc8e610
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 0dbd917..f33c454 100644
--- a/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@ -237,7 +237,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 96e1e42b99847bfc2ea9a56281b77fa5a4ac6f55
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 bb2b41f..0dbd917 100644
--- a/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@ -859,7 +859,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(-)




More information about the freeside-commits mailing list