[freeside-commits] branch FREESIDE_3_BRANCH updated. 057ae504915d912bc60df87c9914e11752edf680

[Ivan Kohler]

The branch, FREESIDE_3_BRANCH has been updated
       via  057ae504915d912bc60df87c9914e11752edf680 (commit)
       via  f2166c28623ef38fe7db2069fce6cc16be865f11 (commit)
       via  df0c7137ef880aedea912c8c735963f0261050d3 (commit)
      from  a439c0c5998c428e7bfd533353911ae48b4bee7b (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 057ae504915d912bc60df87c9914e11752edf680
Merge: f2166c286 a439c0c59
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jul 16 19:07:46 2018 -0700

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


commit f2166c28623ef38fe7db2069fce6cc16be865f11
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jul 16 19:07:38 2018 -0700

    actually a card masking fix for fibernetics, but can't find the ticket

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 7d913b955..8058357a5 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2814,6 +2814,11 @@ sub batch_card {
     'country'  => $options{country}  || $loc->country,
     'payby'    => $options{payby}    || $self->payby,
     'payinfo'  => $options{payinfo}  || $self->payinfo,
+    'paymask'  => ( $options{payinfo}
+                      ? FS::payinfo_Mixin->mask_payinfo( $options{payby},
+                                                         $options{payinfo} )
+                      : $self->paymask
+                  ),
     'exp'      => $options{paydate}  || $self->paydate,
     'payname'  => $options{payname}  || $self->payname,
     'amount'   => $amount,                         # consolidating

commit df0c7137ef880aedea912c8c735963f0261050d3
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Jun 5 10:43:34 2018 -0700

    fix/finish having history records show correct users for UI-triggered queue jobs on v3, RT#14829

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 851285283..9f9b1e2fc 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -2210,7 +2210,11 @@ sub _h_statement {
   "INSERT INTO h_". $self->table. " ( ".
       join(', ', qw(history_date history_user history_action), @fields ).
     ") VALUES (".
-      join(', ', $time, dbh->quote(getotaker()), dbh->quote($action), @values).
+      join(', ', $time,
+                 dbh->quote($FS::CurrentUser::CurrentUser->username),
+                 dbh->quote($action),
+                 @values
+      ).
     ")"
   ;
 }

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

Summary of changes:
 FS/FS/Record.pm    | 6 +++++-
 FS/FS/cust_main.pm | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)