[freeside-commits] branch FREESIDE_3_BRANCH updated. 08e9b7ea8e912dfa70de6d08eb7849d3bd9c68b5

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  08e9b7ea8e912dfa70de6d08eb7849d3bd9c68b5 (commit)
      from  85c406c3ceb14f4b6c3f325f498a79a443103c18 (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 08e9b7ea8e912dfa70de6d08eb7849d3bd9c68b5
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Jan 27 02:50:56 2016 -0800

    show customer email on commission credit detail reports, #40033

diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
index 7738494..0ec463f 100755
--- a/httemplate/search/cust_credit.html
+++ b/httemplate/search/cust_credit.html
@@ -56,33 +56,59 @@ if ($unapplied) {
 push @header, emt('Date'), 
               emt('By'),
               emt('Reason'),
-              FS::UI::Web::cust_header(),
               ;
 push @fields, sub { time2str('%b %d %Y', shift->_date ) },
               'otaker',
               'reason',
-              \&FS::UI::Web::cust_fields,
               ;
-push @sort_fields, '_date', 'otaker', 'reason', FS::UI::Web::cust_sort_fields();
-$align .= 'rll'.FS::UI::Web::cust_aligns();
+push @sort_fields, '_date', 'otaker', 'reason';
+$align .= 'rll';
 push @links,  '',
               '',
               '',
-              ( map { $_ ne 'Cust. Status' ? $clink : '' }
-                         FS::UI::Web::cust_header()
-                   ),
               ;
 push @color,  '',
               '',
               '',
-              FS::UI::Web::cust_colors(),
               ;
 push @style,  '',
               '',
               '',
-              FS::UI::Web::cust_styles(),
               ;
 
+# insert customer email after 'Reason' if this is a commission report
+if ( $cgi->param('commission_salesnum') or $cgi->param('commission_agentnum') ) {
+  my $sub_customer_email = sub {
+    my $cust_credit = shift;
+    return '' unless $cust_credit->eventnum;
+    my $cust_event = FS::cust_event->by_key($cust_credit->eventnum)
+      or return '';
+    my $cust_X = $cust_event->cust_X or return '';
+    my $cust_main = $cust_X->cust_main or return '';
+    my ($email) = $cust_main->invoicing_list_emailonly;
+    return encode_entities("<$email>") if length($email);
+    '';
+  };
+  push @header, '';
+  push @fields, $sub_customer_email;
+  push @sort_fields, '';
+  $align .= 'l';
+  push @links, '';
+  push @color, '';
+  push @style, '';
+}
+
+# cust fields
+push @header, FS::UI::Web::cust_header();
+push @fields, \&FS::UI::Web::cust_fields;
+push @sort_fields, FS::UI::Web::cust_sort_fields;
+$align .= FS::UI::Web::cust_aligns();
+push @links, map { $_ ne 'Cust. Status' ? $clink : '' }
+                         FS::UI::Web::cust_header();
+push @color, FS::UI::Web::cust_colors();
+push @style, FS::UI::Web::cust_styles();
+
+
 my @search = ();
 my $addl_from = '';
 

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

Summary of changes:
 httemplate/search/cust_credit.html |   44 ++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 9 deletions(-)