From 2124062154b8716e2d75264f9a6254b596052df6 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Wed, 27 Jan 2016 02:50:56 -0800 Subject: [PATCH] show customer email on commission credit detail reports, #40033 --- httemplate/search/cust_credit.html | 42 ++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html index 7738494db..2241f02e3 100755 --- a/httemplate/search/cust_credit.html +++ b/httemplate/search/cust_credit.html @@ -56,33 +56,57 @@ 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; + my $cust_event = $cust_credit->cust_event 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 = ''; -- 2.11.0