diff options
| -rw-r--r-- | FS/FS/Record.pm | 6 | ||||
| -rw-r--r-- | FS/FS/cust_main.pm | 5 |
2 files changed, 10 insertions, 1 deletions
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 + ). ")" ; } diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index c5cee8d94..621f3d144 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 |