[freeside-commits] branch master updated. 4819786ef946363806ab0a66cd4eca9ceb7b876d

[Mark Wells]

The branch, master has been updated
       via  4819786ef946363806ab0a66cd4eca9ceb7b876d (commit)
      from  305bd1ffe9c46db5fefffcc41ef6f256374293ee (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 4819786ef946363806ab0a66cd4eca9ceb7b876d
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Mar 28 19:56:49 2013 -0700

    show more detail about payments on invoice, #21949

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e8b3333..76f29bd 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -5198,6 +5198,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'invoice_payment_details',
+    'section'     => 'invoicing',
+    'description' => 'When displaying payments on an invoice, show the payment method used, including the check or credit card number.  Credit card numbers will be masked.',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'cust_main-status_module',
     'section'     => 'UI',
     'description' => 'Which module to use for customer status display.  The "Classic" module (the default) considers accounts with cancelled recurring packages but un-cancelled one-time charges Inactive.  The "Recurring" module considers those customers Cancelled.  Similarly for customers with suspended recurring packages but one-time charges.', #other differences?
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 9bab493..8b156c6 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -3137,11 +3137,16 @@ sub _items_payments {
 
     #something more elaborate if $_->amount ne ->cust_pay->paid ?
 
+    my $desc = $self->mt('Payment received').' '.
+               time2str($date_format,$_->cust_pay->_date );
+    $desc   .= $self->mt(' via ' . $_->cust_pay->payby_payinfo_pretty)
+      if ( $self->conf->exists('invoice_payment_details') );
+ 
     push @b, {
-      'description' => $self->mt('Payment received').' '.
-                       time2str($date_format,$_->cust_pay->_date ),
+      'description' => $desc,
       'amount'      => sprintf("%.2f", $_->amount )
     };
+
   }
 
   @b;

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

Summary of changes:
 FS/FS/Conf.pm      |    7 +++++++
 FS/FS/cust_bill.pm |    9 +++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)