my($query)=$cgi->keywords;
$query ||= ''; #to avoid use of unitialized value errors
-my($orderby);
+
+
+my $orderby;
+
+my $cjoin = '';
+my @extra_sql = ();
+if ( $query =~ /^UN_(.*)$/ ) {
+ $query = $1;
+ $cjoin = 'LEFT JOIN cust_svc USING ( svcnum )';
+ push @extra_sql, 'pkgnum IS NULL';
+}
+
if ( $query eq 'svcnum' ) {
$orderby = 'ORDER BY svcnum';
} else {
eidiot('unimplemented');
}
-my $count_query = 'SELECT COUNT(*) FROM svc_forward';
+my $extra_sql =
+ scalar(@extra_sql)
+ ? ' WHERE '. join(' AND ', @extra_sql )
+ : '';
+
+my $count_query = "SELECT COUNT(*) FROM svc_forward $cjoin $extra_sql";
my $sql_query = {
'table' => 'svc_forward',
'hashref' => {},
- 'extra_sql' => $orderby,
+ 'select' => join(', ',
+ 'svc_forward.*',
+ 'cust_main.custnum',
+ FS::UI::Web::cust_sql_fields(),
+ ),
+ 'extra_sql' => "$extra_sql $orderby",
+ 'addl_from' => ' LEFT JOIN cust_svc USING ( svcnum ) '.
+ ' LEFT JOIN part_svc USING ( svcpart ) '.
+ ' 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',
+%><%= include( 'elements/search.html',
'title' => "Mail forward Search Results",
'name' => 'mail forwards',
'query' => $sql_query,
'header' => [ '#',
'Mail to',
'Forwards to',
- 'Customer',
+ FS::UI::Web::cust_header(),
],
'fields' => [ 'svcnum',
$format_src,
$format_dst,
- $format_cust,
+ \&FS::UI::Web::cust_fields,
],
'links' => [ $link,
$link_src,
$link_dst,
- $link_cust,
+ ( map { $link_cust }
+ FS::UI::Web::cust_header()
+ ),
],
- )
+ )
%>