X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_forward.cgi;h=1785fa00bf232f1c92e396b6a6ad7911d5491a0a;hp=9ffbab3d1dc818810c2df1a537feef0df4c33344;hb=d99603dfa659bc8890433e7de0c3e64ecc82fd9c;hpb=b8215fdae230049ee9d1a9af192f22754dd61352
diff --git a/httemplate/search/svc_forward.cgi b/httemplate/search/svc_forward.cgi
index 9ffbab3d1..1785fa00b 100755
--- a/httemplate/search/svc_forward.cgi
+++ b/httemplate/search/svc_forward.cgi
@@ -15,14 +15,21 @@ my $count_query = 'SELECT COUNT(*) FROM svc_forward';
my $sql_query = {
'table' => 'svc_forward',
'hashref' => {},
+ 'select' => join(', ',
+ 'svc_forward.*',
+ map "cust_main.$_", qw(custnum last first company)
+ ),
'extra_sql' => $orderby,
+ 'addl_from' => 'LEFT JOIN cust_svc USING ( svcnum )'.
+ 'LEFT JOIN cust_pkg USING ( pkgnum )'.
+ 'LEFT JOIN cust_main USING ( custnum )',
};
#
Service # (click to view forward) |
# Mail to (click to view account) |
# Forwards to (click to view account) |
-my $link = [ "${p}/view/svc_forward.cgi?", 'svcnum' ];
+my $link = [ "${p}view/svc_forward.cgi?", 'svcnum' ];
my $format_src = sub {
my $svc_forward = shift;
@@ -62,12 +69,14 @@ my $link_dst = sub {
}
};
-#this would quite a bit more efficient as a left join as part of the main query
my $format_cust = sub {
my $svc_forward = shift;
- my $cust_pkg = $svc_forward->cust_svc->cust_pkg;
- if ( $cust_pkg ) {
- $cust_pkg->cust_main->name;
+
+ if ( $svc_forward->custnum ) {
+ #false laziness w/FS::cust_main::name
+ my $name = $svc_forward->get('last'). ', '. $svc_forward->first;
+ $name = $svc_forward->company. " ($name)" if $svc_forward->company;
+ $name;
} else {
'';
}
@@ -75,9 +84,8 @@ my $format_cust = sub {
my $link_cust = sub {
my $svc_forward = shift;
- my $cust_pkg = $svc_forward->cust_svc->cust_pkg;
- if ( $cust_pkg ) {
- [ "${p}view/cust_main.cgi?", sub { shift->cust_svc->cust_pkg->custnum } ];
+ if ( $svc_forward->custnum ) {
+ [ "${p}view/cust_main.cgi?", 'custnum' ];
} else {
'';
}