[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 804bcfa0ca42ec19595d0cf79d010e66a09a2109

Mark Wells mark at 420.am
Thu Mar 28 20:11:33 PDT 2013


The branch, FREESIDE_2_3_BRANCH has been updated
       via  804bcfa0ca42ec19595d0cf79d010e66a09a2109 (commit)
      from  de1f3ef204d75ae89d81e7f7177ac1b740c6abc7 (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 804bcfa0ca42ec19595d0cf79d010e66a09a2109
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Mar 28 20:10:49 2013 -0700

    show more detail about payments on invoice, #21949

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 88da6f7..36947ad 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -5087,6 +5087,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 aed1ca5..b50f352 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -5342,11 +5342,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(-)




More information about the freeside-commits mailing list