move receivables report to search template

[freeside.git] / httemplate / search / svc_forward.cgi

diff --git a/httemplate/search/svc_forward.cgi b/httemplate/search/svc_forward.cgi
index 9ffbab3..1c1c6e4 100755 (executable)
--- a/httemplate/search/svc_forward.cgi
+++ b/httemplate/search/svc_forward.cgi
@@ -4,7 +4,7 @@ my $conf = new FS::Conf;
 
 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 {
@@ -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 )',
 };
 
 #        <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;
@@ -62,25 +69,10 @@ 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;
-  } 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',
@@ -97,7 +89,7 @@ my $link_cust = sub {
                  'fields'            => [ 'svcnum',
                                           $format_src,
                                           $format_dst,
-                                          $format_cust,
+                                          \&FS::svc_Common::cust_name,
                                         ],
                  'links'             => [ $link,
                                           $link_src,