my($query)=$cgi->keywords;
$query ||= ''; #to avoid use of unitialized value errors
-my($orderby);
+my $orderby;
if ( $query eq 'svcnum' ) {
$orderby = 'ORDER BY svcnum';
} else {
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 )',
};
# <TH>Service #<BR><FONT SIZE=-1>(click to view forward)</FONT></TH>
# <TH>Mail to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
# <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
-my $link = [ "${p}/view/svc_forward.cgi?", 'svcnum' ];
+my $link = [ "${p}view/svc_forward.cgi?", 'svcnum' ];
my $format_src = sub {
my $svc_forward = shift;
}
};
-#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;
- } else {
- '';
- }
-};
-
+#smaller false laziness w/svc_*.cgi here
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 } ];
- } else {
- '';
- }
+ my $svc_x = shift;
+ $svc_x->custnum ? [ "${p}view/cust_main.cgi?", 'custnum' ] : '';
};
%><%= include ('elements/search.html',
'fields' => [ 'svcnum',
$format_src,
$format_dst,
- $format_cust,
+ \&FS::svc_Common::cust_name,
],
'links' => [ $link,
$link_src,