[freeside-commits] branch master updated. bde60d15eb42797e210e681eaf1318f7608042c0

[Jonathan Prykop]

The branch, master has been updated
       via  bde60d15eb42797e210e681eaf1318f7608042c0 (commit)
      from  9c2854f48fb79a5534bbb35c4b7c12b2e6acc0a4 (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 bde60d15eb42797e210e681eaf1318f7608042c0
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Fri Jun 3 22:01:42 2016 -0500

    RT#71049: Add order_number to payment reports

diff --git a/httemplate/search/cust_bill_pay_pkg.html b/httemplate/search/cust_bill_pay_pkg.html
index 5a3be75..7c231a6 100644
--- a/httemplate/search/cust_bill_pay_pkg.html
+++ b/httemplate/search/cust_bill_pay_pkg.html
@@ -14,6 +14,7 @@
 
                    #payment
                    'Date',
+                   'Order Number',
                    'By',
 
                    #application
@@ -43,6 +44,7 @@
                            ? cardtype($cust_pay->paymask) : '';
                        },
                    sub { time2str('%b %d %Y', shift->get('cust_pay_date') ) },
+                   sub { shift->cust_bill_pay->cust_pay->order_number },
                    sub { shift->cust_bill_pay->cust_pay->otaker },
 
                    sub { sprintf($money_char.'%.2f', shift->amount ) },
@@ -64,6 +66,7 @@
                    '', #payinfo/paymask
                    '', #cardtype
                    'cust_pay_date',
+                   '', #order_number
                    '', #'otaker',
                    '', #amount
                    '', #line item description
@@ -85,6 +88,7 @@
                    '',
                    '',
                    '',
+                   '',
                    @post_desc_null,
                    $ilink,
                    $ilink,
@@ -92,7 +96,7 @@
                          FS::UI::Web::cust_header()
                    ),
                ],
-               'align' => 'rcrlrlrlll',
+               'align' => 'rcrlrrlrlll',
 #original value before cardtype & package were added
 #why are there 13 cols?
 #'rcrrlrlllrrcl'.
@@ -110,6 +114,7 @@
                               '',
                               '',
                               '',
+                              '',
                               @post_desc_null,
                               '',
                               '',
@@ -126,6 +131,7 @@
                               '',
                               '',
                               '',
+                              '',
                               @post_desc_null,
                               '',
                               '',
diff --git a/httemplate/search/cust_pay.html b/httemplate/search/cust_pay.html
index e466f6a..536ab29 100755
--- a/httemplate/search/cust_pay.html
+++ b/httemplate/search/cust_pay.html
@@ -4,4 +4,5 @@
                 'name_singular' => emt('payment'),
                 'name_verb'     => emt('paid'),
                 'show_card_type' => 1,
+                'show_order_number' => 1,
 &>
diff --git a/httemplate/search/elements/cust_pay_or_refund.html b/httemplate/search/elements/cust_pay_or_refund.html
index b07f5e9..9f725bb 100755
--- a/httemplate/search/elements/cust_pay_or_refund.html
+++ b/httemplate/search/elements/cust_pay_or_refund.html
@@ -211,6 +211,14 @@ push @links, '';
 push @fields, sub { time2str('%b %d %Y', shift->_date ) };
 push @sort_fields, '_date';
 
+if ($opt{'show_order_number'}) {
+  push @header, emt('Order Number');
+  $align .= 'r';
+  push @links, '';
+  push @fields, 'order_number';
+  push @sort_fields, 'order_number';
+}
+
 unless ( $opt{'disable_by'} ) {
   push @header, emt('By');
   $align .= 'c';

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

Summary of changes:
 httemplate/search/cust_bill_pay_pkg.html           |    8 +++++++-
 httemplate/search/cust_pay.html                    |    1 +
 httemplate/search/elements/cust_pay_or_refund.html |    8 ++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)