[freeside-commits] branch FREESIDE_3_BRANCH updated. 0fa98e9782d550147a68a00d7ee75079ad331666

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  0fa98e9782d550147a68a00d7ee75079ad331666 (commit)
       via  89d30bbd2b79d9b1de0890eec86234bc9d3ce330 (commit)
       via  f7c0ea27d0456385eb5580f325cd00355e3f275e (commit)
      from  c5412ade1a2ce0eb26ffa37d1f3a1540760b2150 (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 0fa98e9782d550147a68a00d7ee75079ad331666
Merge: 89d30bb c5412ad
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Dec 21 15:37:36 2016 -0800

    Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into 3.x


commit 89d30bbd2b79d9b1de0890eec86234bc9d3ce330
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Dec 21 15:25:35 2016 -0800

    fix payinfo_used on batch payments with encrypted payinfo, related to #19571

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index d45d2e3..56de582 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -548,7 +548,8 @@ otherwise returns false.
 
 sub replace {
   my $self = shift;
-  return "Can't modify closed payment" if $self->closed =~ /^Y/i;
+  return "Can't modify closed payment"
+    if $self->closed =~ /^Y/i && !$FS::payinfo_Mixin::allow_closed_replace;
   $self->SUPER::replace(@_);
 }
 
@@ -1252,6 +1253,30 @@ sub _upgrade_data {  #class method
   ###
   #$class->upgrade_set_cardtype;
 
+  # for batch payments, make sure paymask is set
+  do {
+    local $FS::payinfo_Mixin::allow_closed_replace = 1;
+    local $FS::payinfo_Mixin::ignore_masked_payinfo = 1;
+
+    my $cursor = FS::Cursor->new({
+      table => 'cust_pay',
+      extra_sql => ' WHERE paymask IS NULL AND payinfo IS NOT NULL
+                    AND payby IN(\'CARD\', \'CHEK\')
+                    AND batchnum IS NOT NULL',
+    });
+
+    # records from cursors for some reason don't decrypt payinfo, so
+    # call replace_old to fetch the record "normally"
+    while (my $cust_pay = $cursor->fetch) {
+      $cust_pay = $cust_pay->replace_old;
+      $cust_pay->set('paymask', $cust_pay->mask_payinfo);
+      my $error = $cust_pay->replace;
+      if ($error) {
+        die "$error (setting masked payinfo on payment#". $cust_pay->paynum.
+          ")\n"
+      }
+    }
+  };
 }
 
 sub process_upgrade_paybatch {
diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index 774ea29..a4129dc 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -332,6 +332,7 @@ sub approve {
       'custnum'   => $new->custnum,
       'payby'     => $new->payby,
       'payinfo'   => $new->payinfo || $old->payinfo,
+      'paymask'   => $new->mask_payinfo,
       'paid'      => $new->paid,
       '_date'     => $new->_date,
       'usernum'   => $new->usernum,
@@ -458,6 +459,17 @@ sub request_item {
     die "unsupported BatchPayment method: ".$pay_batch->payby;
   }
 
+  my $recurring;
+  if ( $cust_main->status =~ /^active|suspended|ordered$/ ) {
+    if ( $self->payinfo_used ) {
+      $recurring = 'S'; # subsequent
+    } else {
+      $recurring = 'F'; # first use
+    }
+  } else {
+    $recurring = 'N'; # non-recurring
+  }
+
   Business::BatchPayment->create(Item =>
     # required
     action      => 'payment',
@@ -473,6 +485,7 @@ sub request_item {
     ( map { $_ => $location->$_ } qw(address2 city state country zip) ),
     
     invoice_number  => $self->invnum,
+    recurring_billing => $recurring,
     %payment,
   );
 }
diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm
index 4da40e3..520b245 100644
--- a/FS/FS/payinfo_Mixin.pm
+++ b/FS/FS/payinfo_Mixin.pm
@@ -8,7 +8,7 @@ use FS::UID qw(driver_name);
 use FS::Cursor;
 use Time::Local qw(timelocal);
 
-use vars qw($ignore_masked_payinfo);
+use vars qw( $ignore_masked_payinfo $allow_closed_replace );
 
 =head1 NAME
 
@@ -308,13 +308,12 @@ sub payinfo_used {
   my $payinfo = shift || $self->payinfo;
   my %hash = (
     'custnum' => $self->custnum,
-    'payby'   => 'CARD',
+    'payby'   => $self->payby,
   );
 
   return 1
   if qsearch('cust_pay', { %hash, 'payinfo' => $payinfo } )
-  || qsearch('cust_pay', 
-    { %hash, 'paymask' => $self->mask_payinfo('CARD', $payinfo) }  )
+  || qsearch('cust_pay', { %hash, 'paymask' => $self->mask_payinfo } )
   ;
 
   return 0;

commit f7c0ea27d0456385eb5580f325cd00355e3f275e
Author: Mark Wells <mark at freeside.biz>
Date:   Sun Dec 18 17:04:26 2016 -0800

    spelling fix

diff --git a/FS/FS/Cron/pay_batch.pm b/FS/FS/Cron/pay_batch.pm
index cdda681..c9039b8 100644
--- a/FS/FS/Cron/pay_batch.pm
+++ b/FS/FS/Cron/pay_batch.pm
@@ -79,7 +79,7 @@ sub pay_batch_submit {
           # warn the error and continue. rolling back the transaction once 
           # we've started sending batches is bad.
           warn "error submitting batch ".$pay_batch->batchnum." to gateway '".
-          $gateway->label."\n$@\n";
+          $gateway->label."'\n$@\n";
         }
       }
 

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

Summary of changes:
 FS/FS/Cron/pay_batch.pm |    2 +-
 FS/FS/cust_pay.pm       |   27 ++++++++++++++++++++++++++-
 FS/FS/cust_pay_batch.pm |   13 +++++++++++++
 FS/FS/payinfo_Mixin.pm  |    7 +++----
 4 files changed, 43 insertions(+), 6 deletions(-)